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

Don't define __WXOSX__ when building the wxCocoa base library.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-11-19 19:54:36 +00:00
parent afc605b2be
commit 305142ad5f
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/platform.h
View File

@@ -51,8 +51,24 @@
/* /*
__WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X. __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
DO NOT use this define in base library code. Although wxMac has its own
private base library (and thus __WXOSX__,__WXMAC__ and related defines are
valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
To keep wx authors from screwing this up, only enable __WXOSX__ for wxCocoa when
not compiling the base library. We determine this by first checking if
wxUSE_BASE is not defined. If it is not defined, then we're not buildling
the base library, and possibly not building wx at all (but actually building
user code that's using wx). If it is defined then we must check to make sure
it is not true. If it is true, we're building base.
If you want it in the common darwin base library then use __DARWIN__. You
can use any Darwin-available libraries like CoreFoundation but please avoid
using OS X libraries like Carbon or CoreServices.
*/ */
#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__) #if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
# define __WXOSX__ # define __WXOSX__
#endif #endif