SetSelection() must update m_selectionOld, otherwise it doesn't correspond to the...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 606ad4a8d9d7897ad0fc82134f3980ac90db7c6f..1b6b013d9bf130609b7c0093dab0cc8515303c4e 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -115,11 +115,6 @@
 
 #    ifndef __WIN32__
 #        define __WIN32__
-#    endif
-
-    /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */
-#    if !defined(__WIN95__)
-#        define __WIN95__
 #    endif
 #endif /* Win32 */
 
@@ -129,12 +124,6 @@
 #   endif
 #endif
 
-#ifdef __WINE__
-#   ifndef __WIN95__
-#       define __WIN95__
-#   endif
-#endif /* WINE */
-
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 #   ifndef __SMARTPHONE__
@@ -246,11 +235,26 @@
 #endif /* wxUSE_UNICODE */
 
 #if defined( __MWERKS__ ) && !defined(__INTEL__)
-// otherwise MSL headers bring in WIN32 dependant APIs
+/* otherwise MSL headers bring in WIN32 dependant APIs */
 #undef UNICODE
 #endif
 
 
+/*
+   This macro can be used to test the Open Watcom version.
+*/
+#ifndef __WATCOMC__
+#   define wxWATCOM_VERSION(major,minor) 0
+#   define wxCHECK_WATCOM_VERSION(major,minor) 0
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
+#elif defined(__WATCOMC__) && __WATCOMC__ < 1200
+#   error "Only Open Watcom is supported in this release"
+#else
+#   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
+#   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
+#endif
+
 /*
    check the consistency of the settings in setup.h: note that this must be
    done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
@@ -398,14 +402,16 @@
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
+
+    /* wxOS2 vs. non wxOS2 ports on OS2 platform */
+#    if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+#        ifndef __WXPM__
+#            define __WXPM__
+#        endif
+#    endif
+
 #    if defined(__IBMCPP__)
 #        define __VISAGEAVER__ __IBMCPP__
-#    endif
-#    ifndef __WXOS2__
-#        define __WXOS2__
-#    endif
-#    ifndef __WXPM__
-#        define __WXPM__
 #    endif
 
     /* Place other OS/2 compiler environment defines here */
@@ -444,7 +450,7 @@
 #        define __VISUALC__ _MSC_VER
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
-#      elif defined(__WATCOMC__)
+#    elif defined(__WATCOMC__)
 #    elif defined(__SC__)
 #        define __SYMANTECC__
 #    endif  /* compiler */
@@ -488,9 +494,11 @@
 #   define __STDC_EXT__ 1
 #endif
 
-/* Force linking against required libraries under Windows CE: */
+/* Force linking against required libraries under Windows: */
 #ifdef __WXWINCE__
 #   include "wx/msw/wince/libraries.h"
+#elif defined __WINDOWS__
+#   include "wx/msw/libraries.h"
 #endif
 
 /*
@@ -513,9 +521,9 @@
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
-      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+      wxCHECK_WATCOM_VERSION(1,0) ) && \
     !defined(__DOS__) && \
-    !defined(__WXOS2__) && \
+    !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \
@@ -533,7 +541,7 @@
 #endif
 
 #if defined (__WXMAC__)
-#    if !defined(WORDS_BIGENDIAN) && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
+#    if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
 #        define WORDS_BIGENDIAN 1
 #    endif
 #endif