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

Define __WXOSX__ and __WXMAC__ on compiler command line.

Browse Source 
Although __WXMAC__ and __WXMAC__ were already defined in wx/platform.h if
__WXOSX_XXX__ was defined, they couldn't be used for checks done before
including this header, which was surprising and, in case of __WXMAC__,
backwards incompatible. Define them now on the compiler command line to ensure
that they are always defined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-09 13:05:38 +00:00
parent f3d793069f
commit 17005cd723
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -32813,11 +32813,15 @@ echo "${ECHO_T}none" >&6; }
TOOLKIT=OSX_CARBON TOOLKIT=OSX_CARBON
GUIDIST=OSX_CARBON_DIST GUIDIST=OSX_CARBON_DIST
WXBASEPORT="_carbon" WXBASEPORT="_carbon"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi fi
if test "$wxUSE_OSX_COCOA" = 1; then if test "$wxUSE_OSX_COCOA" = 1; then
TOOLKIT=OSX_COCOA TOOLKIT=OSX_COCOA
GUIDIST=OSX_COCOA_DIST GUIDIST=OSX_COCOA_DIST
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi fi
if test "$wxUSE_COCOA" = 1; then if test "$wxUSE_COCOA" = 1; then

9
configure.in
View File

@@ -3469,11 +3469,20 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
dnl are different, so they need different names: dnl are different, so they need different names:
WXBASEPORT="_carbon" WXBASEPORT="_carbon"
dnl in addition to defining __WXOSX_CARBON__ for this toolkit we want
dnl to also define these extra symbols to make it possible to test for
dnl any Mac port (__WXMAC__ is for backwards compatibility, __WXOSX__
dnl is a new name)
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi fi
if test "$wxUSE_OSX_COCOA" = 1; then if test "$wxUSE_OSX_COCOA" = 1; then
TOOLKIT=OSX_COCOA TOOLKIT=OSX_COCOA
GUIDIST=OSX_COCOA_DIST GUIDIST=OSX_COCOA_DIST
dnl see the comment above in wxUSE_OSX_CARBON branch
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi fi
if test "$wxUSE_COCOA" = 1; then if test "$wxUSE_COCOA" = 1; then

23
include/wx/platform.h
View File

@@ -33,20 +33,25 @@
__WXOSX_IPHONE__ means OS X iPhone __WXOSX_IPHONE__ means OS X iPhone
*/ */
/* backwards compatible define, until configure gets updated */ /*
#if defined __WXMAC__ Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
#define __WXOSX_CARBON__ 1 configure but ensure that we also define them if configure was not used for
#endif whatever reason.
The primare symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
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__) #if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
# define __WXOSX__ 1 # ifndef __WXOSX__
#endif # define __WXOSX__ 1
# endif
#ifdef __WXOSX__
/* for backwards compatibility of code (including our own) define __WXMAC__ */
# ifndef __WXMAC__ # ifndef __WXMAC__
# define __WXMAC__ 1 # define __WXMAC__ 1
# endif # endif
#endif
#ifdef __WXOSX__
/* setup precise defines according to sdk used */ /* setup precise defines according to sdk used */
# include <TargetConditionals.h> # include <TargetConditionals.h>
# if defined(__WXOSX_IPHONE__) # if defined(__WXOSX_IPHONE__)