cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switching to OSX naming

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2008-06-11 15:53:10 +00:00
parent d1a64f69cb
commit 712d087f0c
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/features.h
View File

@ -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

2
include/wx/fontdlg.h
View File

@ -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

41
include/wx/platform.h
View File

@ -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