Late note about deprecated wxDbTable constructor.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6623815e5b495fad11d2cfc61dd6d51b0d24cb69..aed9b04776ed952996fa34807528bdc0484ae7d2 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -24,29 +24,29 @@
 #endif
 
 /*
-       WXMAC variants
-       __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
-       carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
-       builds, running under 10.2 + only
+    WXMAC variants
+    __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
+    carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
+    builds, running under 10.2 + only
 */
 #ifdef __WXMAC__
-       #if defined(__MACH__)
-               #define __WXMAC_OSX__ 1
-               #define __WXMAC_CARBON__ 1
-               #define __WXMAC_CLASSIC__ 0
+    #if defined(__MACH__)
+        #define __WXMAC_OSX__ 1
+        #define __WXMAC_CARBON__ 1
+        #define __WXMAC_CLASSIC__ 0
         #ifdef __WXMAC_XCODE__
             #include "wx/mac/carbon/config_xcode.h"
         #endif
-       #else
-               #define __WXMAC_OSX__ 0
-               #if TARGET_CARBON
-                       #define __WXMAC_CARBON__ 1
-                       #define __WXMAC_CLASSIC__ 0
-               #else
-                       #define __WXMAC_CARBON__ 0
-                       #define __WXMAC_CLASSIC__ 1
-               #endif
-       #endif
+    #else
+        #define __WXMAC_OSX__ 0
+        #if TARGET_CARBON
+            #define __WXMAC_CARBON__ 1
+            #define __WXMAC_CLASSIC__ 0
+        #else
+            #define __WXMAC_CARBON__ 0
+            #define __WXMAC_CLASSIC__ 1
+        #endif
+    #endif
 #endif
 
 /*
@@ -117,6 +117,11 @@
                 with it, hence explicitly define a lower WINVER value for it.
              */
 #           define WINVER 0x0400
+#       elif defined(__DMC__)
+            /*
+                Digital Mars is distributed with a little outdated headers.
+             */
+#           define WINVER 0x0400
 #       else /* !VC++ 6 */
             /*
                see MSDN for the description of possible WINVER values, this one
@@ -138,36 +143,45 @@
 #endif /* Win32 */
 
 #if defined(__WXMSW__) || defined(__WIN32__)
-#    if !defined(__WINDOWS__)
-#        define __WINDOWS__
-#    endif
+#   if !defined(__WINDOWS__)
+#       define __WINDOWS__
+#   endif
 #endif
 
 #ifdef __WINE__
-#    ifndef __WIN95__
-#        define __WIN95__
-#    endif
+#   ifndef __WIN95__
+#       define __WIN95__
+#   endif
 #endif /* WINE */
 
-/* detect SmartPhone */
+/* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
-#    ifndef __SMARTPHONE__
-#        define __SMARTPHONE__
-#    endif
+#   ifndef __SMARTPHONE__
+#       define __SMARTPHONE__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif
 #endif
 
 /* detect PocketPC */
 #if defined( WIN32_PLATFORM_PSPC )
-#    ifndef __POCKETPC__
-#        define __POCKETPC__
-#    endif
+#   ifndef __POCKETPC__
+#       define __POCKETPC__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif
 #endif
 
 /* detect Standard WinCE SDK */
 #if defined( WCE_PLATFORM_STANDARDSDK )
-#    ifndef __WINCE_STANDARDSDK__
-#        define __WINCE_STANDARDSDK__
-#    endif
+#   ifndef __WINCE_STANDARDSDK__
+#       define __WINCE_STANDARDSDK__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif
 #endif
 
 #if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC)
@@ -175,11 +189,14 @@
 #       ifndef __WINCE_NET__
 #           define __WINCE_NET__
 #       endif
-#   elif (_WIN32_WCE >= 200) 
+#   elif (_WIN32_WCE >= 200)
 #       ifndef __HANDHELDPC__
 #           define __HANDHELDPC__
 #       endif
 #   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif
 #endif
 
 /*
@@ -410,12 +427,6 @@
 #    define __UNIX__
 #endif /* Unix */
 
-#if defined(__HPUX__) && !defined(__WXGTK__)
-#    ifndef __WXMOTIF__
-#        define __WXMOTIF__
-#    endif /* __WXMOTIF__ */
-#endif
-
 #if defined(__WXMOTIF__) || defined(__WXX11__)
 #    define __X__
 #endif