diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-03-25 20:47:33 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-04 09:37:25 +0200 |
| commit | 7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5 (patch) | |
| tree | 0888d0c52e49ffa0f683bbd927d738971f4a5dbc /src/qtui.h | |
| parent | 1a3f0da9229a8e524d1010cdc8bd3b9da71fe529 (diff) | |
| download | bitcoin-7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5.tar.xz | |
qtui.h/noui.h interface cleanup
- rename wxMessageBox, remove redundant arguments to noui/qtui calls
- also, add flag to force blocking, modal dialog box for disk space warning etc
- clarify function naming
- no more special MessageBox needed from AppInit2, as window object is created before calling AppInit2
Diffstat (limited to 'src/qtui.h')
| -rw-r--r-- | src/qtui.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qtui.h b/src/qtui.h index 07451e5f5e..405fc497c6 100644 --- a/src/qtui.h +++ b/src/qtui.h @@ -7,7 +7,6 @@ #include <string> #include "wallet.h" -typedef void wxWindow; #define wxYES 0x00000002 #define wxOK 0x00000004 #define wxNO 0x00000008 @@ -34,11 +33,11 @@ typedef void wxWindow; #define wxHELP 0x00008000 #define wxMORE 0x00010000 #define wxSETUP 0x00020000 +// Force blocking, modal message box dialog (not just notification) +#define wxMODAL 0x00040000 -extern int MyMessageBox(const std::string& message, const std::string& caption="Message", int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1); -#define wxMessageBox MyMessageBox -extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1); -extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent); +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); extern void MainFrameRepaint(); extern void AddressBookRepaint(); |