Refactoring: no real changes.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index a6f6f0ba66762d938ee3522bbba6238b98d6fb66..817914f90f1372cc759d6ac33e62e87be039be66 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -280,6 +280,14 @@
     #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:
 
@@ -298,21 +306,15 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
+#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+    defined( __CYGWIN__ ) || \
+    (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__)
     #include "wx/msw/gccpriv.h"
 #else
     #undef wxCHECK_W32API_VERSION
     #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
@@ -325,5 +327,39 @@
     #endif
 #endif
 
+/* Choose which method we will use for updating menus
+ * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
+ * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
+ */
+#ifndef wxUSE_IDLEMENUUPDATES
+    #if defined(__WXMSW__) || defined(__WXGTK__)
+        #define wxUSE_IDLEMENUUPDATES 0
+    #else
+        #define wxUSE_IDLEMENUUPDATES 1
+    #endif
+#endif
+
+/*
+ * Define symbols that are not yet in
+ * configure or possibly some setup.h files.
+ * They will need to be added.
+ */
+
+#ifndef wxUSE_FILECONFIG
+    #if wxUSE_CONFIG
+        #define wxUSE_FILECONFIG 1
+    #else
+        #define wxUSE_FILECONFIG 0
+    #endif
+#endif
+
+#ifndef wxUSE_HOTKEY
+    #define wxUSE_HOTKEY 0
+#endif
+
+#if !defined(wxUSE_WXDIB) && defined(__WXMSW__)
+    #define wxUSE_WXDIB 1
+#endif
+
 #endif /* _WX_PLATFORM_H_ */