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

fixing configure builds for iphone

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2011-04-09 09:22:51 +00:00
parent 89db201aba
commit 26632ccd72
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/core/private.h
View File

@ -32,7 +32,7 @@
#define wxOSX_10_6_AND_LATER(x) #define wxOSX_10_6_AND_LATER(x)
#endif #endif
#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
// Carbon functions are currently still used in wxOSX/Cocoa too (including // Carbon functions are currently still used in wxOSX/Cocoa too (including
// wxBase part of it). // wxBase part of it).

2
include/wx/wxcrtbase.h
View File

@ -621,7 +621,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
#endif #endif
#ifdef __DARWIN__ #ifdef __DARWIN__
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 #if !defined(__WXOSX_IPHONE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
#define wxNEED_WX_MBSTOWCS #define wxNEED_WX_MBSTOWCS
#endif #endif
#endif #endif

2
src/osx/core/utilsexc_base.cpp
View File

@ -60,7 +60,7 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
return false; return false;
} }
#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
// have a fast version for mac code that returns the version as a return value // have a fast version for mac code that returns the version as a return value