Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 1305a3ceb5317595c20cc39f1ed0029e6cd169e5..c91ac39e998e88fe1f5d4a5cb0896a3c317cf96b 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -14,16 +14,6 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 

-
-
-/*
-    Codewarrior doesn't define any Windows symbols until some headers
-    are included
-*/
-#ifdef __MWERKS__
-#   include <stddef.h>
-#endif
-

 #ifdef __WXMAC_XCODE__
 #    include <unistd.h>
 #    include <TargetConditionals.h>
 #ifdef __WXMAC_XCODE__
 #    include <unistd.h>
 #    include <TargetConditionals.h>


@@ -37,6 +27,12 @@
 #    ifndef MAC_OS_X_VERSION_10_6
 #       define MAC_OS_X_VERSION_10_6 1060
 #    endif
 #    ifndef MAC_OS_X_VERSION_10_6
 #       define MAC_OS_X_VERSION_10_6 1060
 #    endif

+#    ifndef MAC_OS_X_VERSION_10_7
+#       define MAC_OS_X_VERSION_10_7 1070
+#    endif
+#    ifndef MAC_OS_X_VERSION_10_8
+#       define MAC_OS_X_VERSION_10_8 1080
+#    endif

 #    include "wx/osx/config_xcode.h"
 #    ifndef __WXOSX__
 #        define __WXOSX__ 1
 #    include "wx/osx/config_xcode.h"
 #    ifndef __WXOSX__
 #        define __WXOSX__ 1


@@ -163,15 +159,6 @@
  */
 #include "wx/setup.h"
 
  */
 #include "wx/setup.h"
 

-#ifdef __GCCXML__
-    /*
-        we're using gccxml to create an XML representation of the entire
-        wxWidgets interface; use a special setup_gccxml.h file to fix some
-        of the stuff #defined by the real setup.h
-    */
-    #include "wx/setup_gccxml.h"
-#endif
-

 /*
    Convenience for any optional classes that use the wxAnyButton base class.
  */
 /*
    Convenience for any optional classes that use the wxAnyButton base class.
  */


@@ -236,11 +223,6 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
 #   endif
 #endif /* wxUSE_UNICODE */
 

-#if defined( __MWERKS__ ) && !defined(__INTEL__)
-/* otherwise MSL headers bring in WIN32 dependant APIs */
-#undef UNICODE
-#endif
-

 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo
 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo


@@ -397,17 +379,6 @@
 #        endif
 #    endif
 
 #        endif
 #    endif
 

-/*
-   OS: Classic Mac OS
- */
-#elif defined(applec) || \
-      defined(THINK_C) || \
-      (defined(__MWERKS__) && !defined(__INTEL__))
-      /* MacOS */
-#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-#        define wxSIZE_T_IS_ULONG
-#    endif
-

 /*
    OS: OS/2
  */
 /*
    OS: OS/2
  */


@@ -446,9 +417,9 @@
 
     /*
        define another standard symbol for Microsoft Visual C++: the standard
 
     /*
        define another standard symbol for Microsoft Visual C++: the standard

-       one (_MSC_VER) is also defined by Metrowerks compiler
+       one (_MSC_VER) is also defined by some other compilers.

      */
      */

-#    if defined(_MSC_VER) && !defined(__MWERKS__)
+#    if defined(_MSC_VER)

 #        define __VISUALC__ _MSC_VER
 
     /*
 #        define __VISUALC__ _MSC_VER
 
     /*


@@ -469,6 +440,8 @@
 #       define __VISUALC9__
 #   elif __VISUALC__ < 1700
 #       define __VISUALC10__
 #       define __VISUALC9__
 #   elif __VISUALC__ < 1700
 #       define __VISUALC10__

+#   elif __VISUALC__ < 1800
+#       define __VISUALC11__

 #   else
 #       pragma message("Please update wx/platform.h to recognize this VC++ version")
 #   endif
 #   else
 #       pragma message("Please update wx/platform.h to recognize this VC++ version")
 #   endif


@@ -642,8 +615,7 @@
     checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
     for it.
  */
     checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
     for it.
  */

-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
-        || (defined(__DARWIN__) && !wxUSE_GUI)
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)

 #   ifndef __WXOSX__
 #       define __WXOSX__ 1
 #   endif
 #   ifndef __WXOSX__
 #       define __WXOSX__ 1
 #   endif


@@ -682,6 +654,12 @@
 #        ifndef MAC_OS_X_VERSION_10_6
 #           define MAC_OS_X_VERSION_10_6 1060
 #        endif
 #        ifndef MAC_OS_X_VERSION_10_6
 #           define MAC_OS_X_VERSION_10_6 1060
 #        endif

+#        ifndef MAC_OS_X_VERSION_10_7
+#           define MAC_OS_X_VERSION_10_7 1070
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_8
+#           define MAC_OS_X_VERSION_10_8 1080
+#        endif

 #    else
 #        error "only mach-o configurations are supported"
 #    endif
 #    else
 #        error "only mach-o configurations are supported"
 #    endif


@@ -768,7 +746,7 @@
 
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
 
 /* 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.
+ * Presently, only Windows, OS X and GTK+ support wxEVT_MENU_OPEN.

  */
 #ifndef wxUSE_IDLEMENUUPDATES
 #    if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
  */
 #ifndef wxUSE_IDLEMENUUPDATES
 #    if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)