summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2010-07-03 10:34:13 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2010-07-03 10:34:13 +0000
commit10e625a11a23a8fb7397dec3412d64cb95d7a8ce (patch)
tree6340d585cca01ad7830578e8c069bfed1eeba095 /Source/Core
parent2a3aa881fdf62713e3e8aa81e53ace20f6ea977a (diff)
PluginWiimoteNew now needs libwiiuse.
Treat external data (configuration file and device names) as 8-bit data. Character set mapping is not ideal, but at least such names can be used. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5824 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/InputUICommon/Src/ConfigDiag.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp
index 3ecdb8ed22..7d0446e9e7 100644
--- a/Source/Core/InputUICommon/Src/ConfigDiag.cpp
+++ b/Source/Core/InputUICommon/Src/ConfigDiag.cpp
@@ -18,7 +18,7 @@
#include "ConfigDiag.h"
#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
-#define WXSTR_FROM_STR(s) (wxString::FromAscii((s).c_str()))
+#define WXSTR_FROM_STR(s) (wxString::From8BitData((s).c_str()))
// ToAscii was causing probs with some extended ascii characters, To8BitData seems to work
#define STR_FROM_WXSTR(w) (std::string((w).To8BitData()))