From: Vadim Zeitlin Date: Mon, 5 Oct 2009 22:53:48 +0000 (+0000) Subject: Added wxICON_NONE to wxICON_MASK. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2e61f76aacedb946e20215f4cb44dbaa1f0c1b69 Added wxICON_NONE to wxICON_MASK. Absence of icon is also an icon flag. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/defs.h b/include/wx/defs.h index 708b4b9aa7..fd5449895b 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1825,7 +1825,6 @@ enum wxBorder #define wxICON_INFORMATION 0x00000800 #define wxICON_STOP wxICON_HAND #define wxICON_ASTERISK wxICON_INFORMATION -#define wxICON_MASK (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION) #define wxFORWARD 0x00001000 #define wxBACKWARD 0x00002000 @@ -1835,6 +1834,9 @@ enum wxBorder #define wxSETUP 0x00020000 #define wxICON_NONE 0x00040000 +#define wxICON_MASK \ + (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION|wxICON_NONE) + /* * Background styles. See wxWindow::SetBackgroundStyle */