Merge branch '0.5.x' into 0.6.0.x

[novacoin.git] / src / noui.h

diff --git a/src/noui.h b/src/noui.h
index 5f6cc75..8888db6 100644 (file)
--- a/src/noui.h
+++ b/src/noui.h
@@ -1,12 +1,10 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2011 The Bitcoin developers
+// 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 <stdint.h>
-
 #include <string>
 #include <boost/function.hpp>
 #include "wallet.h"
@@ -38,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)
 {
@@ -52,7 +52,7 @@ inline int ThreadSafeMessageBox(const std::string& message, const std::string& c
     return MyMessageBox(message, caption, style, parent, x, y);
 }
 
-inline bool ThreadSafeAskFee(int64_t nFeeRequired, const std::string& strCaption, wxWindow* parent)
+inline bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent)
 {
     return true;
 }