invalidate m_selection in DoRemovePage(), not in DeletePage() (replaces patch 998984)

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2c4e3db37b224805092d7fe908d1b4c8b798e0df..6518f7396d35c9e6fefe1917e28d3509478aae1b 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -5,7 +5,7 @@
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
 * RCS-ID:      $Id$
-* Copyright:   (c) 1997-2001 wxWindows team
+* Copyright:   (c) 1997-2001 wxWidgets team
 * Licence:     wxWindows licence
 */
 
@@ -23,6 +23,32 @@
 #    include <stddef.h>
 #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
+*/
+#ifdef __WXMAC__
+       #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
+#endif
+
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
@@ -58,7 +84,8 @@
 #   endif /* !__WIN64__ */
 #endif /* _WIN64 */
 
-#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
+#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \
+    && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
@@ -94,6 +121,39 @@
 #    endif
 #endif /* WINE */
 
+/* detect SmartPhone */
+#if defined( WIN32_PLATFORM_WFSP )
+#    ifndef __SMARTPHONE__
+#        define __SMARTPHONE__
+#    endif
+#endif
+
+/* detect PocketPC */
+#if defined( WIN32_PLATFORM_PSPC )
+#    ifndef __POCKETPC__
+#        define __POCKETPC__
+#    endif
+#endif
+
+/* detect Standard WinCE SDK */
+#if defined( WCE_PLATFORM_STANDARDSDK )
+#    ifndef __WINCE_STANDARDSDK__
+#        define __WINCE_STANDARDSDK__
+#    endif
+#endif
+
+#if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC)
+#   if (_WIN32_WCE >= 400)
+#       ifndef __WINCE_NET__
+#           define __WINCE_NET__
+#       endif
+#   elif (_WIN32_WCE >= 200) 
+#       ifndef __HANDHELDPC__
+#           define __HANDHELDPC__
+#       endif
+#   endif
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -105,7 +165,7 @@
 
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
-   and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
+   and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
    the system headers so bring these settings in sync
  */
 
@@ -129,14 +189,21 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
-
+#if defined( __MWERKS__ ) && !defined(__INTEL__)
+// otherwise MSL headers bring in WIN32 dependant APIs
+#undef UNICODE
+#endif
 /*
-   some compilers don't support iostream.h any longer, so override the users
-   setting here in such case.
+   some compilers don't support iostream.h any longer, while some of theme
+   are not updated with <iostream> yet, so override the users setting here
+   in such case.
  */
 #if defined(_MSC_VER) && (_MSC_VER >= 1310)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 0
+#elif defined(__DMC__) || defined(__WATCOMC__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */
 
 /*
@@ -281,7 +348,7 @@
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
-#        define __WIN16__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"
 #    endif
 
     /*
@@ -330,6 +397,11 @@
 #    endif
 #endif
 
+/* Force linking against required libraries under Windows CE: */
+#ifdef __WXWINCE__
+#   include "wx/msw/wince/libraries.h"
+#endif
+
 /*
    This macro can be used to test the gcc version and can be used like this:
 
@@ -348,9 +420,10 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
-    (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+    !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION
@@ -374,7 +447,7 @@
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES
-#    if defined(__WXMSW__) || defined(__WXGTK__)
+#    if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
 #        define wxUSE_IDLEMENUUPDATES 0
 #    else
 #        define wxUSE_IDLEMENUUPDATES 1