Set wxABI_VERSION default value to e.g. 29999 so that new APIs can be wrapped

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 837900f660f37f80133e3cc8680d1e32e8aa40cc..e4f6b3d8652ab60274a540524a326084e0bb4473 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -515,6 +515,20 @@ typedef int wxWindowID;
     #define WXUNUSED_UNLESS_DEBUG(param)  WXUNUSED(param)
 #endif
 
     #define WXUNUSED_UNLESS_DEBUG(param)  WXUNUSED(param)
 #endif
 

+/*  some arguments are not used in unicode mode */
+#if wxUSE_UNICODE
+    #define WXUNUSED_IN_UNICODE(param)  WXUNUSED(param)
+#else
+    #define WXUNUSED_IN_UNICODE(param)  param
+#endif
+
+/*  some arguments are not used in WinCE build */
+#ifdef __WXWINCE__
+    #define WXUNUSED_IN_WINCE(param)  WXUNUSED(param)
+#else
+    #define WXUNUSED_IN_WINCE(param)  param
+#endif
+

 /*  some compilers give warning about a possibly unused variable if it is */
 /*  initialized in both branches of if/else and shut up if it is initialized */
 /*  when declared, but other compilers then give warnings about unused variable */
 /*  some compilers give warning about a possibly unused variable if it is */
 /*  initialized in both branches of if/else and shut up if it is initialized */
 /*  when declared, but other compilers then give warnings about unused variable */


@@ -639,6 +653,10 @@ enum {  wxDefaultCoord = -1 };
 /*  define fixed length types */
 /*  ---------------------------------------------------------------------------- */
 
 /*  define fixed length types */
 /*  ---------------------------------------------------------------------------- */
 

+#if defined(__WXPALMOS__) || defined(__MINGW32__)
+    #include <sys/types.h>
+#endif
+

 /*  chars are always one byte (by definition), shorts are always two (in */
 /*  practice) */
 
 /*  chars are always one byte (by definition), shorts are always two (in */
 /*  practice) */
 


@@ -938,7 +956,6 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 /* Make sure ssize_t is defined (a signed type the same size as size_t) */
 /* HAVE_SSIZE_T should be defined for compiliers that already have it */
 #ifdef __MINGW32__
 /* Make sure ssize_t is defined (a signed type the same size as size_t) */
 /* HAVE_SSIZE_T should be defined for compiliers that already have it */
 #ifdef __MINGW32__

-    #include <sys/types.h>

     #if defined(_SSIZE_T_) && !defined(HAVE_SSIZE_T)
         #define HAVE_SSIZE_T
     #endif
     #if defined(_SSIZE_T_) && !defined(HAVE_SSIZE_T)
         #define HAVE_SSIZE_T
     #endif


@@ -1600,22 +1617,21 @@ enum wxBackgroundStyle
 /*  standard IDs */
 /*  ---------------------------------------------------------------------------- */
 
 /*  standard IDs */
 /*  ---------------------------------------------------------------------------- */
 

-/*  any id: means that we don't care about the id, whether when installing an */
-/*  event handler or when creating a new window */
+/*  Standard menu IDs */

 enum
 {
 enum
 {

-    wxID_ANY = -1
-};
+    /* no id matches this one when compared to it */
+    wxID_NONE = -3,

 
 

-/*  id for a separator line in the menu (invalid for normal item) */
-enum
-{
-    wxID_SEPARATOR = -2
-};
+    /*  id for a separator line in the menu (invalid for normal item) */
+    wxID_SEPARATOR = -2,

 
 

-/*  Standard menu IDs */
-enum
-{
+    /* any id: means that we don't care about the id, whether when installing
+     * an event handler or when creating a new window */
+    wxID_ANY = -1,
+
+
+    /* all predefined ids are between wxID_LOWEST and wxID_HIGHEST */

     wxID_LOWEST = 4999,
 
     wxID_OPEN,
     wxID_LOWEST = 4999,
 
     wxID_OPEN,


@@ -1899,7 +1915,7 @@ enum
     wxTOOL_RIGHT
 };
 
     wxTOOL_RIGHT
 };
 

-/*  the values of the format constants should be the same as correspondign */
+/*  the values of the format constants should be the same as corresponding */

 /*  CF_XXX constants in Windows API */
 enum wxDataFormatId
 {
 /*  CF_XXX constants in Windows API */
 enum wxDataFormatId
 {


@@ -2291,7 +2307,7 @@ enum wxUpdateUI
             NASTY HACK because the gethostname in sys/unistd.h which the gnu
             stl includes and wx builds with by default clash with each other
             (windows version 2nd param is int, sys/unistd.h version is unsigned
             NASTY HACK because the gethostname in sys/unistd.h which the gnu
             stl includes and wx builds with by default clash with each other
             (windows version 2nd param is int, sys/unistd.h version is unsigned

-            int).  
+            int).

           */
 #        define gethostname gethostnameHACK
 #        include <unistd.h>
           */
 #        define gethostname gethostnameHACK
 #        include <unistd.h>


@@ -2438,6 +2454,7 @@ typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
 
 #if defined(__WXPALMOS__)
 
 
 #if defined(__WXPALMOS__)
 

+typedef void *          WXHWND;

 typedef void *          WXHANDLE;
 typedef void *          WXHICON;
 typedef void *          WXHFONT;
 typedef void *          WXHANDLE;
 typedef void *          WXHICON;
 typedef void *          WXHFONT;


@@ -2460,13 +2477,18 @@ typedef unsigned short  WXWORD;
 typedef unsigned long   WXCOLORREF;
 typedef struct tagMSG   WXMSG;
 
 typedef unsigned long   WXCOLORREF;
 typedef struct tagMSG   WXMSG;
 

-typedef WinHandle       WXWINHANDLE;
+typedef WXHWND          WXWINHANDLE; /* WinHandle of PalmOS */

 typedef WXWINHANDLE     WXWidget;
 
 typedef WXWINHANDLE     WXWidget;
 

+typedef void *          WXFORMPTR;
+typedef void *          WXEVENTPTR;
+typedef void *          WXRECTANGLEPTR;
+

 #endif /* __WXPALMOS__ */
 
 
 #endif /* __WXPALMOS__ */
 
 

-#if defined(__WXMSW__)
+/* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */
+#if defined(__WIN32__)

 
 /*  the keywords needed for WinMain() declaration */
 #ifndef WXFAR
 
 /*  the keywords needed for WinMain() declaration */
 #ifndef WXFAR


@@ -2518,12 +2540,12 @@ typedef long            WXLPARAM;
 typedef long            WXLRESULT;
 #endif
 
 typedef long            WXLRESULT;
 #endif
 

-#if !defined(__WIN32__) || defined(__GNUWIN32__) || defined(__WXMICROWIN__)
+#if defined(__GNUWIN32__) || defined(__WXMICROWIN__)

 typedef int             (*WXFARPROC)();
 #else
 typedef int             (__stdcall *WXFARPROC)();
 #endif
 typedef int             (*WXFARPROC)();
 #else
 typedef int             (__stdcall *WXFARPROC)();
 #endif

-#endif /*  __WXMSW__ */
+#endif /*  __WIN32__ */

 
 
 #if defined(__WXPM__) || defined(__EMX__)
 
 
 #if defined(__WXPM__) || defined(__EMX__)