Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 01953df50c82765e51324ea018622a085134dcfc..fd5449895bd3cc960a2a1bb42b54e585785fb997 100644 (file)
--- 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_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
 
 #define  wxFORWARD              0x00001000
 #define  wxBACKWARD             0x00002000


@@ -1835,6 +1834,9 @@ enum wxBorder
 #define  wxSETUP                0x00020000
 #define wxICON_NONE             0x00040000
 
 #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
  */
 /*
  * 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(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_UIWindow WXWindow;
 typedef WX_UIView WXWidget;

+typedef WX_EAGLContext WXGLContext;
+typedef WX_NSString* WXGLPixelFormat;

 
 #endif
 
 
 #endif