Mostly Mingw32/Cygwin corrections

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 676b0ace7b0c8d7ac4f7e2978a52f74e83d22524..174363f982412874338bbd868d3e7ecc9b8e8663 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -328,7 +328,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(__WXMSW__)
+#if defined(__WIN32__)
     #if defined(__MINGW32__) || defined(__GNUWIN32__)
         #define wxCALLBACK __attribute__((stdcall))
     #else
@@ -336,7 +336,7 @@ typedef int wxWindowID;
         #define wxCALLBACK _stdcall
     #endif
 #else
-    // no stdcall under Unix
+    // no stdcall under Unix nor Win16
     #define wxCALLBACK
 #endif // platform
 
@@ -604,15 +604,15 @@ enum
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)
-       typedef short double    wxFloat64;
+    typedef short double       wxFloat64;
 #else
-       typedef double                  wxFloat64;
+    typedef double                     wxFloat64;
 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )
-       typedef long double wxDouble;
+    typedef long double wxDouble;
 #else
-       typedef double wxDouble ;
+    typedef double wxDouble ;
 #endif
 
 // ----------------------------------------------------------------------------
@@ -1153,6 +1153,14 @@ enum wxStretch
 // standard IDs
 // ----------------------------------------------------------------------------
 
+// id for a separator line in the menu (invalid for normal item)
+#define wxID_SEPARATOR (-1)
+
+// this one is for compatibility only, don't use in new code
+#ifndef ID_SEPARATOR
+    #define ID_SEPARATOR    wxID_SEPARATOR
+#endif
+
 // Standard menu IDs
 #define wxID_LOWEST             4999