diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 15:43:29 -0400 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 15:43:29 -0400 |
commit | fe1725a141334dab82ca007fb6fc983c358e35b2 (patch) | |
tree | d0c9729480297b1a4ee6a1565f07c2cbc18adfff /src/noui.h | |
parent | 1376cd9d7f1d7df4395d5d686450bde44e260785 (diff) | |
parent | 658cf0b1be93e08eee400b0bd1e9d3485313475d (diff) | |
download | bitcoin-fe1725a141334dab82ca007fb6fc983c358e35b2.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/bitcoinrpc.cpp
Diffstat (limited to 'src/noui.h')
-rw-r--r-- | src/noui.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/noui.h b/src/noui.h index 458fc647a0..8888db69f8 100644 --- a/src/noui.h +++ b/src/noui.h @@ -36,6 +36,8 @@ typedef void wxWindow; #define wxHELP 0x00008000 #define wxMORE 0x00010000 #define wxSETUP 0x00020000 +// Force blocking, modal message box dialog (not just notification) +#define wxMODAL 0x00040000 inline int MyMessageBox(const std::string& message, const std::string& caption="Message", int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1) { |