From 26632ccd725e8c168a0b143a9bb1110ba436a65c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 9 Apr 2011 09:22:51 +0000 Subject: [PATCH] fixing configure builds for iphone git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/core/private.h | 2 +- include/wx/wxcrtbase.h | 2 +- src/osx/core/utilsexc_base.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 568ad1e167..c08bc26049 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -32,7 +32,7 @@ #define wxOSX_10_6_AND_LATER(x) #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 // wxBase part of it). diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index d9ee66261a..522531a637 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -621,7 +621,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); #endif #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 #endif #endif diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp index bf7e95b6a5..e1a8a61e0d 100644 --- a/src/osx/core/utilsexc_base.cpp +++ b/src/osx/core/utilsexc_base.cpp @@ -60,7 +60,7 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning() 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