Merge branch 'master' of ssh://amethyst/home/orion/projects2/bitcoin/bitcoin-qt

1 files changed, 65 insertions, 1 deletions

diff --git a/gui/src/bitcoin.cpp b/gui/src/bitcoin.cpp
index c843cc406..dc3e8070b 100644
--- a/gui/src/bitcoin.cpp
+++ b/gui/src/bitcoin.cpp
@@ -5,21 +5,85 @@
 #include "clientmodel.h"
 #include "util.h"
 #include "init.h"
+#include "externui.h"
 
 #include <QApplication>
+#include <QMessageBox>
+
+// Need a global reference to process net thread
+BitcoinGUI *guiref;
+
+int MyMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y)
+{
+    // Message from main thread
+    printf("MyMessageBox\n");
+    if(guiref)
+    {
+        guiref->error(QString::fromStdString(caption),
+                      QString::fromStdString(message));
+    }
+    else
+    {
+        QMessageBox::critical(0, QString::fromStdString(caption),
+            QString::fromStdString(message),
+            QMessageBox::Ok, QMessageBox::Ok);
+    }
+    return 4;
+}
+
+int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y)
+{
+    // Message from network thread
+    if(guiref)
+    {
+        QMetaObject::invokeMethod(guiref, "error", Qt::QueuedConnection,
+                                   Q_ARG(QString, QString::fromStdString(caption)),
+                                   Q_ARG(QString, QString::fromStdString(message)));
+    }
+    else
+    {
+        printf("%s: %s\n", caption.c_str(), message.c_str());
+        fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str());
+    }
+    return 4;
+}
+
+bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent)
+{
+    // Query from network thread
+    // TODO
+    return true;
+}
+
+void CalledSetStatusBar(const std::string& strText, int nField)
+{
+    // Only used for built-in mining, which is disabled, simple ignore
+}
+
+void UIThreadCall(boost::function0<void> fn)
+{
+    // Only used for built-in mining, which is disabled, simple ignore
+}
+
+void MainFrameRepaint()
+{
+}
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
+    BitcoinGUI window;
+    guiref = &window;
 
     try {
         if(AppInit2(argc, argv))
         {
             ClientModel model;
-            BitcoinGUI window;
             window.setModel(&model);
 
             window.show();
+            guiref = 0;
 
             /* Depending on settings: QApplication::setQuitOnLastWindowClosed(false); */
             int retval = app.exec();