fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a395b94c7367eb84a21913d02e026c1ff8ea339e..2924970772b4853eab1c2199f45a92dec731b8c9 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
 
+/*  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 */
@@ -559,7 +573,7 @@ typedef int wxWindowID;
     #define except(x) catch(...)
 #endif /*  Metrowerks */
 
-#if defined(__WATCOMC__)
+#if defined(__WATCOMC__) && (__WATCOMC__ < 1240)
     typedef short mode_t;
 #endif
 
@@ -624,14 +638,7 @@ enum
 /*  ---------------------------------------------------------------------------- */
 
 /*  the type for screen and DC coordinates */
-
-#if wxUSE_COMPATIBLE_COORD_TYPES
-    /*  to ensure compatibility with 2.0, we must use long */
-    #define wxCoord long
-#else  /*  !wxUSE_COMPATIBLE_COORD_TYPES */
-        /*  other platforms we support have at least 32bit int - quite enough */
-        typedef int wxCoord;
-#endif /*  wxUSE_COMPATIBLE_COORD_TYPES/!wxUSE_COMPATIBLE_COORD_TYPES */
+typedef int wxCoord;
 
 enum {  wxDefaultCoord = -1 };
 
@@ -639,6 +646,10 @@ enum {  wxDefaultCoord = -1 };
 /*  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) */
 
@@ -884,7 +895,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("L")
-#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
+#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
       #define wxLongLong_t __int64
       #define wxLongLongSuffix i64
       #define wxLongLongFmtSpec _T("L")
@@ -938,7 +949,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__
-    #include <sys/types.h>
     #if defined(_SSIZE_T_) && !defined(HAVE_SSIZE_T)
         #define HAVE_SSIZE_T
     #endif
@@ -946,6 +956,9 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 #if defined(__PALMOS__) && !defined(HAVE_SSIZE_T)
     #define HAVE_SSIZE_T
 #endif
+#if defined(__WATCOMC__) && __WATCOMC__ > 1230
+    #define HAVE_SSIZE_T
+#endif
 #ifndef HAVE_SSIZE_T
     #if SIZEOF_SIZE_T == 4
         typedef wxInt32 ssize_t;
@@ -1600,22 +1613,21 @@ enum wxBackgroundStyle
 /*  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
 {
-    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,
@@ -1788,6 +1800,11 @@ enum wxHitTest
 /*  Don't do parent client adjustments (for implementation only) */
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
+#if wxABI_VERSION >= 20602
+/*  Change the window position even if it seems to be already correct */
+#define wxSIZE_FORCE            0x0010
+#endif // 2.6.2+
+
 /*  ---------------------------------------------------------------------------- */
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
@@ -2291,7 +2308,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
-            int).  
+            int).
           */
 #        define gethostname gethostnameHACK
 #        include <unistd.h>
@@ -2438,6 +2455,7 @@ typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
 
 #if defined(__WXPALMOS__)
 
+typedef void *          WXHWND;
 typedef void *          WXHANDLE;
 typedef void *          WXHICON;
 typedef void *          WXHFONT;
@@ -2460,13 +2478,18 @@ typedef unsigned short  WXWORD;
 typedef unsigned long   WXCOLORREF;
 typedef struct tagMSG   WXMSG;
 
-typedef WinHandle       WXWINHANDLE;
+typedef WXHWND          WXWINHANDLE; /* WinHandle of PalmOS */
 typedef WXWINHANDLE     WXWidget;
 
+typedef void *          WXFORMPTR;
+typedef void *          WXEVENTPTR;
+typedef void *          WXRECTANGLEPTR;
+
 #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
@@ -2518,12 +2541,12 @@ typedef long            WXLPARAM;
 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
-#endif /*  __WXMSW__ */
+#endif /*  __WIN32__ */
 
 
 #if defined(__WXPM__) || defined(__EMX__)
@@ -2650,6 +2673,7 @@ typedef void*           WXRegion;
 typedef void*           WXFont;
 typedef void*           WXImage;
 typedef void*           WXFontList;
+typedef void*           WXFontSet;
 typedef void*           WXRendition;
 typedef void*           WXRenderTable;
 typedef void*           WXFontType; /* either a XmFontList or XmRenderTable */