diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-03-03 19:56:36 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-03-03 19:56:36 -0600 |
| commit | fcf87f6c53fd26b4dcbba5151185f3c4f4d4bd1d (patch) | |
| tree | 08fd3277db552867f251bed449400f68387ac6f6 /Source/Core/Common/Src/MsgHandler.cpp | |
| parent | cedfa452b4497590f828306b42b1e7c24915fd58 (diff) | |
| parent | 814c2ffdfd213dfa78078471d298e2657b7e14e9 (diff) | |
Merge branch 'windows-unicode'
Fixed unicode filename handling on Windows.
Made all significant projects build with "Unicode" option on Windows.
Fixed unicode string handling in GUI code on all OSes.
From now on: std::string == UTF-8.
Fixed issue 4111.
Fixed issue 5178.
Fixed issue 5980.
Diffstat (limited to 'Source/Core/Common/Src/MsgHandler.cpp')
| -rw-r--r-- | Source/Core/Common/Src/MsgHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 7c666227aa..283dc72ef1 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -106,7 +106,7 @@ bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int S if (Style == QUESTION) STYLE = MB_ICONQUESTION; if (Style == WARNING) STYLE = MB_ICONWARNING; - return IDYES == MessageBox(0, text, caption, STYLE | (yes_no ? MB_YESNO : MB_OK)); + return IDYES == MessageBox(0, UTF8ToTStr(text).c_str(), UTF8ToTStr(caption).c_str(), STYLE | (yes_no ? MB_YESNO : MB_OK)); #else printf("%s\n", text); |