From 38f8221bfc351293ea1214366f240a89828710c4 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sun, 18 Jan 2009 08:47:24 +0000 Subject: reverted 1914, but updated the default handler instead windows now suppose to use it until we fix the debug window git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1915 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/MsgHandler.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'Source/Core/Common/Src/MsgHandler.cpp') diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index fdb8ad97b2..61888a8c6f 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -68,18 +68,16 @@ bool MsgAlert(const char* caption, bool yes_no, int Style, const char* format, . // ŻŻŻŻŻŻŻŻŻ bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style) { - #ifdef _WIN32 - if (yes_no) - // Return true for IDYES - return IDYES == MessageBox(0, "Why is there no icon", caption, - MB_ICONQUESTION | MB_YESNO); - else { - MessageBox(0, text, caption, MB_ICONWARNING); - return true; - } - #else - printf("%s\n", text); - return true; - #endif +#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)); + +#else + printf("%s\n", text); + return true; +#endif } -- cgit v1.2.3