piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 16:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to be consistent with conversions between std::string and wxString.

Browse Source
This commit is contained in:
Jordan Woyak
2013-02-27 22:37:38 -06:00
parent e82d976d2f
commit 56f09d3b91
39 changed files with 344 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Src/X11Utils.cpp
View File

@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include "X11Utils.h"
#include "WxUtils.h"
#include <unistd.h>
#include <spawn.h>
@ -350,7 +351,7 @@ void XRRConfiguration::AddResolutions(wxArrayString& arrayStringFor_FullscreenRe
if (std::find(resos.begin(), resos.end(), strRes) == resos.end())
{
resos.push_back(strRes);
arrayStringFor_FullscreenResolution.Add(wxString::FromUTF8(strRes.c_str()));
arrayStringFor_FullscreenResolution.Add(StrToWxStr(strRes));
}
}
}