warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index b874db6b36ce12b5b6f5e56f052732e8e708cf87..817914f90f1372cc759d6ac33e62e87be039be66 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -280,6 +280,14 @@
     #define __X__
 #endif
 
     #define __X__
 #endif
 

+#ifdef __SC__
+    #ifdef __DMC__
+         #define __DIGITALMARS__
+    #else
+         #define __SYMANTEC__
+    #endif
+#endif
+

 /*
    This macro can be used to test the gcc version and can be used like this:
 
 /*
    This macro can be used to test the gcc version and can be used like this:
 


@@ -307,14 +315,6 @@
     #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
     #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 

-#ifdef __SC__
-    #ifdef __DMC__
-         #define __DIGITALMARS__
-    #else
-         #define __SYMANTEC__
-    #endif
-#endif
-

 #if defined (__WXMSW__)
     #if !defined(__WATCOMC__)
         #define wxHAVE_RAW_BITMAP
 #if defined (__WXMSW__)
     #if !defined(__WATCOMC__)
         #define wxHAVE_RAW_BITMAP


@@ -332,8 +332,7 @@
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES

-    #if (defined(__WXMSW__) && !defined(__WXWINCE)) ||\
-         defined(__WXGTK__)
+    #if defined(__WXMSW__) || defined(__WXGTK__)

         #define wxUSE_IDLEMENUUPDATES 0
     #else
         #define wxUSE_IDLEMENUUPDATES 1
         #define wxUSE_IDLEMENUUPDATES 0
     #else
         #define wxUSE_IDLEMENUUPDATES 1