diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
| commit | 57d4ba8dcca69e26a7897a90a4c01b5922d276b1 (patch) | |
| tree | 47bd045f33336b5228a928a065093bdd81fc5cbb /Source/Core/Common/Src/MsgHandler.cpp | |
| parent | bad4f7f790b6038450488d1c23d8b65329cea4b4 (diff) | |
| parent | 40d919b352a553913f2c1e93e9fa39f2b968b04b (diff) | |
Merge branch 'master' into new-ax-hle
Diffstat (limited to 'Source/Core/Common/Src/MsgHandler.cpp')
| -rw-r--r-- | Source/Core/Common/Src/MsgHandler.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 7c666227aa..90369df1ae 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -102,15 +102,14 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style) { #ifdef _WIN32 - int STYLE = MB_ICONINFORMATION; - 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)); - + int STYLE = MB_ICONINFORMATION; + if (Style == QUESTION) STYLE = MB_ICONQUESTION; + if (Style == WARNING) STYLE = MB_ICONWARNING; + + return IDYES == MessageBox(0, UTF8ToTStr(text).c_str(), UTF8ToTStr(caption).c_str(), STYLE | (yes_no ? MB_YESNO : MB_OK)); #else - printf("%s\n", text); - return true; + printf("%s\n", text); + return true; #endif } |
