Make testcases build, prevent windows symbol collision

This commit is contained in:
Wladimir J. van der Laan
2012-05-19 09:35:26 +02:00
parent 0832c0d166
commit 239c11d0dd
13 changed files with 103 additions and 80 deletions

View File

@@ -13,39 +13,6 @@ class CBasicKeyStore;
class CWallet;
class uint256;
/** Flags for CClientUIInterface::ThreadSafeMessageBox */
enum MessageBoxFlags
{
MF_YES = 0x00000002,
MF_OK = 0x00000004,
MF_NO = 0x00000008,
MF_YES_NO = (MF_YES|MF_NO),
MF_CANCEL = 0x00000010,
MF_APPLY = 0x00000020,
MF_CLOSE = 0x00000040,
MF_OK_DEFAULT = 0x00000000,
MF_YES_DEFAULT = 0x00000000,
MF_NO_DEFAULT = 0x00000080,
MF_CANCEL_DEFAULT = 0x80000000,
MF_ICON_EXCLAMATION = 0x00000100,
MF_ICON_HAND = 0x00000200,
MF_ICON_WARNING = MF_ICON_EXCLAMATION,
MF_ICON_ERROR = MF_ICON_HAND,
MF_ICON_QUESTION = 0x00000400,
MF_ICON_INFORMATION = 0x00000800,
MF_ICON_STOP = MF_ICON_HAND,
MF_ICON_ASTERISK = MF_ICON_INFORMATION,
MF_ICON_MASK = (0x00000100|0x00000200|0x00000400|0x00000800),
MF_FORWARD = 0x00001000,
MF_BACKWARD = 0x00002000,
MF_RESET = 0x00004000,
MF_HELP = 0x00008000,
MF_MORE = 0x00010000,
MF_SETUP = 0x00020000,
// Force blocking, modal message box dialog (not just OS notification)
MF_MODAL = 0x00040000
};
/** General change type (added, updated, removed). */
enum ChangeType
{
@@ -58,6 +25,39 @@ enum ChangeType
class CClientUIInterface
{
public:
/** Flags for CClientUIInterface::ThreadSafeMessageBox */
enum MessageBoxFlags
{
YES = 0x00000002,
OK = 0x00000004,
NO = 0x00000008,
YES_NO = (YES|NO),
CANCEL = 0x00000010,
APPLY = 0x00000020,
CLOSE = 0x00000040,
OK_DEFAULT = 0x00000000,
YES_DEFAULT = 0x00000000,
NO_DEFAULT = 0x00000080,
CANCEL_DEFAULT = 0x80000000,
ICON_EXCLAMATION = 0x00000100,
ICON_HAND = 0x00000200,
ICON_WARNING = ICON_EXCLAMATION,
ICON_ERROR = ICON_HAND,
ICON_QUESTION = 0x00000400,
ICON_INFORMATION = 0x00000800,
ICON_STOP = ICON_HAND,
ICON_ASTERISK = ICON_INFORMATION,
ICON_MASK = (0x00000100|0x00000200|0x00000400|0x00000800),
FORWARD = 0x00001000,
BACKWARD = 0x00002000,
RESET = 0x00004000,
HELP = 0x00008000,
MORE = 0x00010000,
SETUP = 0x00020000,
// Force blocking, modal message box dialog (not just OS notification)
MODAL = 0x00040000
};
/** Show message box. */
boost::signals2::signal<void (const std::string& message, const std::string& caption, int style)> ThreadSafeMessageBox;