switching to OSX naming

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/features.h b/include/wx/features.h
index 6f2fe7cf1820b389fd9bde3ace4c7117a3dae51a..c604c0bc594cb8a568cc53fa36126ff4cf98f0e1 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -35,7 +35,7 @@
 /*  taskbar is implemented in the major ports */
 #if defined(__WXMSW__) || defined(__WXCOCOA__) \
     || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
-    || defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
+    || defined(__WXOSX_MAC__) || defined(__WXCOCOA__)
     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxUSE_TASKBARICON

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index dfeacdc4d79b5a859afc7944d677119d98e9ce53..8a908237263494bf6ea0883f6af5c54052b6f5f7 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -74,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined( __WXMAC_OSX__ )
+#if defined( __WXOSX_MAC__ )
 //set to 1 to use native mac font and color dialogs
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 9e7d5bf4f79de5777c3c2bf5d96032fc8cc479f1..f64a2d2f67181b9ca622799b53c6fd427b226822 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -28,15 +28,35 @@
 #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
+    WXOSX targets
+    __WXOSX_MAC__ means Mac OS X, non embedded
+    __WXOSX_IPHONE__ means OS X iPhone
 */
-#ifdef __WXMAC__
+
+/* supporting the old short name */
+
+#ifdef __WXMAC__ 
+#   define __WXOSX__
+#endif
+
+#ifdef __WXOSX__
+/* for backwards compatibility of code (including our own) define __WXMAC__ */
+#define __WXMAC__
+/* setup precise defines according to sdk used */
+#   include <TargetConditionals.h>
+#   if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#       define __WXOSX_IPHONE__
+#       undef __WXOSX_MAC__
+#   elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
+#       undef __WXOSX_IPHONE__
+#       define __WXOSX_MAC__
+#      else
+#              error "unknown SDK, neither TARGET_OS_MAC nor TARGET_OS_IPHONE set in <TargetConditionals.h>"
+#   endif
+#endif
+
+#ifdef __WXOSX_MAC__
 #    if defined(__MACH__)
-#        define __WXMAC_OSX__
-#        define __WXMAC_CARBON__ /* for backwards compat in user code still defined */
 #        include <AvailabilityMacros.h>
 #        ifndef MAC_OS_X_VERSION_10_4
 #           define MAC_OS_X_VERSION_10_4 1040
@@ -44,6 +64,9 @@
 #        ifndef MAC_OS_X_VERSION_10_5
 #           define MAC_OS_X_VERSION_10_5 1050
 #        endif
+#        ifndef MAC_OS_X_VERSION_10_6
+#           define MAC_OS_X_VERSION_10_6 1060
+#        endif
 #    else
 #        error "only mach-o configurations are supported"
 #    endif
@@ -68,13 +91,15 @@
     using OS X libraries like Carbon or CoreServices.
 
  */
-#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXASPEN__)
+#if defined(__WXOSX_MAC__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXOSX_IPHONE__)
 #   define __WXOSX__
 #endif
 
 #ifdef __WXOSX__
 #    ifdef __WXMAC_XCODE__
 #        include <unistd.h>
+#        include <TargetConditionals.h>
+#        include <AvailabilityMacros.h>
 #        include "wx/mac/config_xcode.h"
 #    endif
 #endif