X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83874e15474164056d1b315fe5ec808fd6da1fea..4f9db74e9852ca3f4bfe9a13c6dd4ca5f6714946:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index d814dfcd49..705efe38df 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -300,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
 
 // ============================================================================
@@ -409,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
@@ -2010,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)();