X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d55906de77d5e0a62729bbe6bd30d958f4c70099..19b409860202ab9bdc27dab3d17f388c1a1d9717:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 01953df50c..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 */ @@ -2840,9 +2842,12 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIFont); DECLARE_WXCOCOA_OBJC_CLASS(UIImage); DECLARE_WXCOCOA_OBJC_CLASS(UIEvent); DECLARE_WXCOCOA_OBJC_CLASS(NSSet); +DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext); typedef WX_UIWindow WXWindow; typedef WX_UIView WXWidget; +typedef WX_EAGLContext WXGLContext; +typedef WX_NSString* WXGLPixelFormat; #endif