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

defines reordered, support for non-precomp cocoa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-06 16:30:42 +00:00
parent bfa29337d4
commit 935e6c7dc1
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/osx/chkconf.h
View File

@@ -49,10 +49,18 @@
* using mixins of cocoa functionality
*/
#ifndef wxOSX_USE_COCOA
#ifdef __WXOSX_COCOA__
#define wxOSX_USE_COCOA 1
#else
#define wxOSX_USE_COCOA 0
#endif
#ifdef __WXOSX_CARBON__
#define wxOSX_USE_CARBON 1
#else
#define wxOSX_USE_CARBON 0
#endif
/*
* setting flags according to the platform
*/
@@ -66,15 +74,9 @@
#define wxOSX_USE_IPHONE 0
#else
#ifdef __WXOSX_IPHONE__
#define wxOSX_USE_CARBON 0
#define wxOSX_USE_IPHONE 1
#else
#define wxOSX_USE_IPHONE 0
#if wxOSX_USE_COCOA
#define wxOSX_USE_CARBON 0
#else
#define wxOSX_USE_CARBON 1
#endif
#endif
#endif