diff options
| author | nakeee <nakeee@gmail.com> | 2009-03-18 22:05:31 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-03-18 22:05:31 +0000 |
| commit | dc9a4860b937cc5d8b96fe751c8dc3b912047944 (patch) | |
| tree | 6efb14b39ee6ab1808b510e2f85733f67a2d03f0 /Source/Core/Common/Src/MsgHandler.cpp | |
| parent | da288c5780f9ce12539e8f325752c4f11e1f6583 (diff) | |
Trying to make a button that disable panic alerts popups please test
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2680 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/MsgHandler.cpp')
| -rw-r--r-- | Source/Core/Common/Src/MsgHandler.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 155d77fd11..5d951fb6c8 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -16,9 +16,6 @@ // http://code.google.com/p/dolphin-emu/ -////////////////////////////////////////////////////////////////////////////////////// -// Include and declarations -// ŻŻŻŻŻŻŻŻŻ #include <stdio.h> // System #include "Common.h" // Local @@ -26,20 +23,22 @@ bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); static MsgAlertHandler msg_handler = DefaultMsgHandler; -///////////////////////////// +static bool AlertEnabled = true; - -/* Select which of these functions that are used for message boxes. If wxWidgets is enabled - we will use wxMsgAlert() that is defined in main.cpp */ +/* Select which of these functions that are used for message boxes. If + wxWidgets is enabled we will use wxMsgAlert() that is defined in main.cpp */ void RegisterMsgAlertHandler(MsgAlertHandler handler) { msg_handler = handler; } -///////////////////////////////////////////////////////////// -/* This is the first stop for messages where the log is updated and the correct windows - is shown */ -// ŻŻŻŻŻŻŻŻŻ +// enable/disable the alert handler +void SetEnableAlert(bool enable) { + AlertEnabled = enable; +} + +/* This is the first stop for gui alerts where the log is updated and the + correct windows is shown */ bool MsgAlert(const char* caption, bool yes_no, int Style, const char* format, ...) { // --------------------------------- @@ -54,17 +53,14 @@ bool MsgAlert(const char* caption, bool yes_no, int Style, const char* format, . va_end(args); ERROR_LOG(MASTER_LOG, "%s: %s", caption, buffer); - // ----------- - if (msg_handler) { + if (msg_handler && AlertEnabled) { ret = msg_handler(caption, buffer, yes_no, Style); } return ret; } -///////////////////////////////////////////////////////////// -/* This is used in the No-GUI build */ -// ŻŻŻŻŻŻŻŻŻ +// Default non library depended panic alert bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style) { #ifdef _WIN32 |