fixing configure builds for iphone

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 568ad1e16766fa8824eca521d8ea163681453179..c08bc26049d980b91a45921fd75b73eef1a2dcc8 100644 (file)
--- 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
 
     #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).
 
 // 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 d9ee66261ac3754d30c960eba3c2db0a24eefac8..522531a6375098ff9be5abe99e117d1237fecbda 100644 (file)
--- 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__
 #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
         #define wxNEED_WX_MBSTOWCS
     #endif
 #endif

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index bf7e95b6a5ebd67b778f568db10a8de87b7b83d2..e1a8a61e0d075f8062a9749f1d2df306ad1501f6 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -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