wxAPIENTRY fixes (?)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 7adcc6ae051a91bed9b568eb323cb6ed9503c693..1b10e1a33b0c5bf40c9929f7546a45a8b4633dd0 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -328,15 +328,23 @@ typedef int wxWindowID;
 // portable calling conventions macros
 // ----------------------------------------------------------------------------
 
-// wxCALLBACK should be used for the functions which are called back by
-// Windows (such as compare function for wxListCtrl)
-#if defined(__WIN32__)
-    #if defined(__MINGW32__) || defined(__GNUWIN32__)
+// stdcall is used for all functions called by Windows under Windows
+#ifdef __WINDOWS__
+    #if defined(__GNUWIN32__)
         #define wxCALLBACK __attribute__((stdcall))
     #else
         // both VC++ and Borland understand this
         #define wxCALLBACK _stdcall
     #endif
+#else // Win
+    // no such stupidness under Unix
+    #define wxSTDCALL
+#endif // platform
+
+// wxCALLBACK should be used for the functions which are called back by
+// Windows (such as compare function for wxListCtrl)
+#if defined(__WIN32__)
+    #define wxCALLBACK wxSTDCALL
 #else
     // no stdcall under Unix nor Win16
     #define wxCALLBACK
@@ -1781,6 +1789,17 @@ typedef WXHWND WXWidget;
 #endif
 #endif
 
+// the keywords needed for WinMain() declaration
+#ifdef __WIN16__
+    #ifndef FAR
+        #ifdef __VISUALC__
+            #define FAR __far
+        #else // !VC++
+            #define FAR _far
+        #endif
+    #endif // no FAR
+#endif // Win16/32
+
 #endif // MSW
 
 #ifdef __WXMOTIF__