expanding builds

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9ed2232e6aaec25c8e14dd1c238f3981cdba10db..7d67449000313ea624c8b8ed881e34f649f3b7c7 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -36,7 +36,9 @@
          !defined(__WXPALMOS__)&& \
          !defined(__WXGTK__)   && \
          !defined(__WXPM__)    && \
          !defined(__WXPALMOS__)&& \
          !defined(__WXGTK__)   && \
          !defined(__WXPM__)    && \

-         !defined(__WXMAC__)   && \
+         !defined(__WXOSX_CARBON__)   && \
+         !defined(__WXOSX_COCOA__)   && \
+         !defined(__WXOSX_IPHONE__)   && \

          !defined(__WXCOCOA__) && \
          !defined(__X__)       && \
          !defined(__WXMGL__)   && \
          !defined(__WXCOCOA__) && \
          !defined(__X__)       && \
          !defined(__WXMGL__)   && \


@@ -637,6 +639,15 @@ typedef short int WXTYPE;
             ptr = NULL;
         }
     }
             ptr = NULL;
         }
     }

+
+    // trivial implementation of std::swap() for primitive types
+    template <typename T>
+    inline void wxSwap(T& first, T& second)
+    {
+        T tmp(first);
+        first = second;
+        second = tmp;
+    }

 #endif /*__cplusplus*/
 
 /*  size of statically declared array */
 #endif /*__cplusplus*/
 
 /*  size of statically declared array */


@@ -1864,8 +1875,10 @@ enum wxBorder
 #define wxAPPLY                 0x00000020
 #define wxCLOSE                 0x00000040
 
 #define wxAPPLY                 0x00000020
 #define wxCLOSE                 0x00000040
 

-#define wxYES_DEFAULT           0x00000000  /*  has no effect (default) */
-#define wxNO_DEFAULT            0x00000080
+#define wxOK_DEFAULT            0x00000000  /* has no effect (default) */
+#define wxYES_DEFAULT           0x00000000  /* has no effect (default) */
+#define wxNO_DEFAULT            0x00000080  /* only valid with wxYES_NO */
+#define wxCANCEL_DEFAULT        0x80000000  /* only valid with wxCANCEL */

 
 #define wxICON_EXCLAMATION      0x00000100
 #define wxICON_HAND             0x00000200
 
 #define wxICON_EXCLAMATION      0x00000100
 #define wxICON_HAND             0x00000200


@@ -2693,7 +2706,6 @@ typedef void*       WXEVENTREF;
 typedef void*       WXEVENTHANDLERREF;
 typedef void*       WXEVENTHANDLERCALLREF;
 typedef void*       WXAPPLEEVENTREF;
 typedef void*       WXEVENTHANDLERREF;
 typedef void*       WXEVENTHANDLERCALLREF;
 typedef void*       WXAPPLEEVENTREF;

-typedef void*       WXHMENU;

 
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;


@@ -2703,6 +2715,8 @@ typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ;
 #if wxOSX_USE_CARBON
 typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
 typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;
 #if wxOSX_USE_CARBON
 typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
 typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;

+typedef struct __AGLPixelFormatRec   *WXGLPixelFormat;
+typedef struct __AGLContextRec       *WXGLContext;

 #endif
 
 typedef void*       WXDisplay;
 #endif
 
 typedef void*       WXDisplay;


@@ -2739,9 +2753,13 @@ typedef struct __HIShape * HIMutableShapeRef;
 
 DECLARE_WXMAC_OPAQUE_REF( PasteboardRef )
 DECLARE_WXMAC_OPAQUE_REF( IconRef )
 
 DECLARE_WXMAC_OPAQUE_REF( PasteboardRef )
 DECLARE_WXMAC_OPAQUE_REF( IconRef )

+DECLARE_WXMAC_OPAQUE_REF( MenuRef )

 
 typedef IconRef WXHICON ;
 typedef HIShapeRef WXHRGN;
 
 typedef IconRef WXHICON ;
 typedef HIShapeRef WXHRGN;

+#if wxOSX_USE_CARBON
+typedef MenuRef WXHMENU;
+#endif

 
 #endif
 
 
 #endif
 


@@ -2840,6 +2858,8 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
 DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
 DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);
 DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
 DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);

+DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
+DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat);

 #ifndef __WXMAC__
 typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
 #endif
 #ifndef __WXMAC__
 typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
 #endif


@@ -2853,6 +2873,9 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSString);
 
 typedef WX_NSWindow WXWindow;
 typedef WX_NSView WXWidget;
 
 typedef WX_NSWindow WXWindow;
 typedef WX_NSView WXWidget;

+typedef WX_NSMenu WXHMENU;
+typedef WX_NSOpenGLPixelFormat WXGLPixelFormat;
+typedef WX_NSOpenGLContext WXGLContext;

 
 #elif wxOSX_USE_IPHONE
 
 
 #elif wxOSX_USE_IPHONE