Merge pull request #1988 from Diapolo/ThreadSafeMessageBox

update CClientUIInterface and remove orphan Wx stuff

1 files changed, 19 insertions, 2 deletions

diff --git a/src/noui.cpp b/src/noui.cpp
index db25f2d28..ba2b1aab4 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -2,16 +2,33 @@
 // Copyright (c) 2009-2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "ui_interface.h"
 #include "init.h"
 #include "bitcoinrpc.h"
 
 #include <string>
 
-static int noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style)
+static int noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style)
 {
+    std::string strCaption;
+    // Check for usage of predefined caption
+    switch (style) {
+    case CClientUIInterface::MSG_ERROR:
+        strCaption += _("Error");
+        break;
+    case CClientUIInterface::MSG_WARNING:
+        strCaption += _("Warning");
+        break;
+    case CClientUIInterface::MSG_INFORMATION:
+        strCaption += _("Information");
+        break;
+    default:
+        strCaption += caption; // Use supplied caption
+    }
+
     printf("%s: %s\n", caption.c_str(), message.c_str());
-    fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str());
+    fprintf(stderr, "%s: %s\n", strCaption.c_str(), message.c_str());
     return 4;
 }