X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..bd52bee1062faef26287d2f5a2595a9d8ee4d85a:/include/wx/defs.h?ds=inline

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 35630816eb..705efe38df 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -187,8 +187,11 @@
         #define __SYMANTECC__
     #endif  // compiler
 
-    // size_t is the same as unsigned int for all Windows compilers we know
-    #define wxSIZE_T_IS_UINT
+    // size_t is the same as unsigned int for all Windows compilers we know,
+    // so define it if it hadn't been done by configure yet
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #define wxSIZE_T_IS_UINT
+    #endif
 #endif  // OS
 
 // if we're on a Unix system but didn't use configure (so that setup.h didn't
@@ -297,7 +300,10 @@
 // compatibility code
 #if !wxUSE_GUI
     #undef WXWIN_COMPATIBILITY_2
+    #undef WXWIN_COMPATIBILITY_2_2
+
     #define WXWIN_COMPATIBILITY_2 0
+    #define WXWIN_COMPATIBILITY_2_2 0
 #endif // !GUI
 
 // ============================================================================
@@ -406,7 +412,7 @@ typedef int wxWindowID;
 
 // wxCALLBACK should be used for the functions which are called back by
 // Windows (such as compare function for wxListCtrl)
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
     #define wxCALLBACK wxSTDCALL
 #else
     // no stdcall under Unix nor Win16
@@ -2007,7 +2013,7 @@ typedef struct tagLOGPALETTE
 } LOGPALETTE;
 #endif //__WXPM__
 
-#if defined(__GNUWIN32__) || defined(__WXWINE__)
+#if defined(__GNUWIN32__) || defined(__WXWINE__) || defined(__WXMICROWIN__)
     typedef int (*WXFARPROC)();
 #elif defined(__WIN32__)
     typedef int (__stdcall *WXFARPROC)();