aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bitcoin-qt.pro5
-rw-r--r--src/headers.h7
-rw-r--r--src/makefile.linux-mingw3
-rw-r--r--src/makefile.mingw3
-rw-r--r--src/makefile.osx3
-rw-r--r--src/makefile.unix3
-rw-r--r--src/noui.cpp45
-rw-r--r--src/noui.h76
-rw-r--r--src/qt/transactiondesc.cpp2
-rw-r--r--src/ui_interface.h (renamed from src/qtui.h)8
10 files changed, 63 insertions, 92 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index a2bf4010e5..7ad94037cf 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -115,7 +115,6 @@ HEADERS += src/qt/bitcoingui.h \
src/key.h \
src/db.h \
src/script.h \
- src/noui.h \
src/init.h \
src/headers.h \
src/irc.h \
@@ -135,7 +134,6 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/guiconstants.h \
src/qt/optionsmodel.h \
src/qt/monitoreddatamapper.h \
- src/qtui.h \
src/qt/transactiondesc.h \
src/qt/transactiondescdialog.h \
src/qt/bitcoinamountfield.h \
@@ -156,7 +154,8 @@ HEADERS += src/qt/bitcoingui.h \
src/protocol.h \
src/qt/notificator.h \
src/qt/qtipcserver.h \
- src/allocators.h
+ src/allocators.h \
+ src/ui_interface.h
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \
diff --git a/src/headers.h b/src/headers.h
index 3596fd08da..ceee028977 100644
--- a/src/headers.h
+++ b/src/headers.h
@@ -87,8 +87,5 @@
#include "bignum.h"
#include "base58.h"
#include "main.h"
-#ifdef QT_GUI
-#include "qtui.h"
-#else
-#include "noui.h"
-#endif
+#include "wallet.h"
+#include "ui_interface.h"
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 40ce1dcdca..0bbe612a06 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -59,7 +59,8 @@ OBJS= \
obj/rpcdump.o \
obj/script.o \
obj/util.o \
- obj/wallet.o
+ obj/wallet.o \
+ obj/noui.o
all: bitcoind.exe
diff --git a/src/makefile.mingw b/src/makefile.mingw
index f7dfcc74c1..307fca7834 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -57,7 +57,8 @@ OBJS= \
obj/rpcdump.o \
obj/script.o \
obj/util.o \
- obj/wallet.o
+ obj/wallet.o \
+ obj/noui.o
all: bitcoind.exe
diff --git a/src/makefile.osx b/src/makefile.osx
index 8790d92ce4..6388a71e11 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -74,7 +74,8 @@ OBJS= \
obj/rpcdump.o \
obj/script.o \
obj/util.o \
- obj/wallet.o
+ obj/wallet.o \
+ obj/noui.o
ifdef USE_UPNP
DEFS += -DUSE_UPNP=$(USE_UPNP)
diff --git a/src/makefile.unix b/src/makefile.unix
index 92c1b97e1f..66e020bbef 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -105,7 +105,8 @@ OBJS= \
obj/rpcdump.o \
obj/script.o \
obj/util.o \
- obj/wallet.o
+ obj/wallet.o \
+ obj/noui.o
all: bitcoind
diff --git a/src/noui.cpp b/src/noui.cpp
new file mode 100644
index 0000000000..077e460a70
--- /dev/null
+++ b/src/noui.cpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2009-2012 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+#include "ui_interface.h"
+
+#include <string>
+#include "headers.h"
+#include "init.h"
+
+int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style)
+{
+ 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)
+{
+ return true;
+}
+
+void MainFrameRepaint()
+{
+}
+
+void AddressBookRepaint()
+{
+}
+
+void InitMessage(const std::string &message)
+{
+}
+
+std::string _(const char* psz)
+{
+ return psz;
+}
+
+void QueueShutdown()
+{
+ // Without UI, Shutdown can simply be started in a new thread
+ CreateThread(Shutdown, NULL);
+}
+
diff --git a/src/noui.h b/src/noui.h
deleted file mode 100644
index 4ae57365a6..0000000000
--- a/src/noui.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2012 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_NOUI_H
-#define BITCOIN_NOUI_H
-
-#include <string>
-#include "wallet.h"
-#include "init.h"
-
-#define wxYES 0x00000002
-#define wxOK 0x00000004
-#define wxNO 0x00000008
-#define wxYES_NO (wxYES|wxNO)
-#define wxCANCEL 0x00000010
-#define wxAPPLY 0x00000020
-#define wxCLOSE 0x00000040
-#define wxOK_DEFAULT 0x00000000
-#define wxYES_DEFAULT 0x00000000
-#define wxNO_DEFAULT 0x00000080
-#define wxCANCEL_DEFAULT 0x80000000
-#define wxICON_EXCLAMATION 0x00000100
-#define wxICON_HAND 0x00000200
-#define wxICON_WARNING wxICON_EXCLAMATION
-#define wxICON_ERROR wxICON_HAND
-#define wxICON_QUESTION 0x00000400
-#define wxICON_INFORMATION 0x00000800
-#define wxICON_STOP wxICON_HAND
-#define wxICON_ASTERISK wxICON_INFORMATION
-#define wxICON_MASK (0x00000100|0x00000200|0x00000400|0x00000800)
-#define wxFORWARD 0x00001000
-#define wxBACKWARD 0x00002000
-#define wxRESET 0x00004000
-#define wxHELP 0x00008000
-#define wxMORE 0x00010000
-#define wxSETUP 0x00020000
-// Force blocking, modal message box dialog (not just notification)
-#define wxMODAL 0x00040000
-
-inline int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK)
-{
- printf("%s: %s\n", caption.c_str(), message.c_str());
- fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str());
- return 4;
-}
-
-inline bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption)
-{
- return true;
-}
-
-inline void MainFrameRepaint()
-{
-}
-
-inline void AddressBookRepaint()
-{
-}
-
-inline void InitMessage(const std::string &message)
-{
-}
-
-inline const char* _(const char* psz)
-{
- return psz;
-}
-
-inline void QueueShutdown()
-{
- // Without UI, Shutdown can simply be started in a new thread
- CreateThread(Shutdown, NULL);
-}
-
-#endif
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 4cb2e68d0f..c32a006f71 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -4,7 +4,7 @@
#include "bitcoinunits.h"
#include "headers.h"
-#include "qtui.h"
+#include "ui_interface.h"
#include <QString>
diff --git a/src/qtui.h b/src/ui_interface.h
index 405fc497c6..2e29f2af16 100644
--- a/src/qtui.h
+++ b/src/ui_interface.h
@@ -1,11 +1,11 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_EXTERNUI_H
-#define BITCOIN_EXTERNUI_H
+#ifndef BITCOIN_UI_INTERFACE_H
+#define BITCOIN_UI_INTERFACE_H
#include <string>
-#include "wallet.h"
+#include "util.h" // for int64
#define wxYES 0x00000002
#define wxOK 0x00000004
@@ -36,6 +36,8 @@
// Force blocking, modal message box dialog (not just notification)
#define wxMODAL 0x00040000
+/* These UI communication functions are implemented in bitcoin.cpp (for ui) and noui.cpp (no ui) */
+
extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK);
extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption);
extern void ThreadSafeHandleURL(const std::string& strURL);
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-08 18:13:05 +0000