support compiling for iphone

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

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index caf0a2ff577b9e82819b6f4ed8671d9a46305373..c4ddcfd1f2a66f8c38e02ee54e60729fbf1d2131 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -289,6 +289,41 @@
 #define wxOSX_USE_NATIVE_TOOLBAR 0
 #endif
 
 #define wxOSX_USE_NATIVE_TOOLBAR 0
 #endif
 

+#if wxUSE_RIBBON
+#undef wxUSE_RIBBON
+#define wxUSE_RIBBON 0
+#endif
+
+#if wxUSE_INFOBAR
+#undef wxUSE_INFOBAR
+#define wxUSE_INFOBAR 0
+#endif
+
+#if wxUSE_FILE_HISTORY
+#undef wxUSE_FILE_HISTORY
+#define wxUSE_FILE_HISTORY 0
+#endif
+
+#if wxUSE_NOTIFICATION_MESSAGE
+#undef wxUSE_NOTIFICATION_MESSAGE
+#define wxUSE_NOTIFICATION_MESSAGE 0
+#endif
+
+#if wxUSE_PROPGRID
+#undef wxUSE_PROPGRID
+#define wxUSE_PROPGRID 0
+#endif
+
+#if wxUSE_WEBKIT
+#undef wxUSE_WEBKIT
+#define wxUSE_WEBKIT 0
+#endif
+
+#if wxUSE_DATAOBJ
+#undef wxUSE_DATAOBJ
+#define wxUSE_DATAOBJ 0
+#endif
+

 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */
 
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */
 

diff --git a/include/wx/osx/private/glgrab.h b/include/wx/osx/private/glgrab.h
index 9961f51c2ef165fe5068e6fcec5ea32fd55ef4e6..bca90cb457d15734b429e01948f33f94607bde25 100644 (file)
--- a/include/wx/osx/private/glgrab.h
+++ b/include/wx/osx/private/glgrab.h
@@ -4,7 +4,8 @@
     extern "C" {
 #endif
 
     extern "C" {
 #endif
 

-    CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect);
+    CGImageRef grabViaOpenGL(CGDirectDisplayID display, 
+                             CGRect srcRect);

 
 #if defined __cplusplus
     }
 
 #if defined __cplusplus
     }

diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index a65b2b7dfea6fb3ed907ed44c72c5a64f8b86a7c..bfb10702be2a37af0b17e180b6e83f3d0fd0cffc 100644 (file)
--- a/src/osx/carbon/dataobj.cpp
+++ b/src/osx/carbon/dataobj.cpp
@@ -29,7 +29,7 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-#ifdef __DARWIN__
+#if wxOSX_USE_COCOA_OR_CARBON

     #include <QuickTime/QuickTime.h>
 #endif
 
     #include <QuickTime/QuickTime.h>
 #endif
 

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index 37c815e24d3e0d6047e63822b10194f88af0766b..fa46e150881ddfafede5f008ec0563eb7d53cc19 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -11,6 +11,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxOSX_USE_COCOA_OR_CARBON
+

 #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
 #include "wx/icon.h"
 
 #ifndef WX_PRECOMP


@@ -361,3 +363,5 @@ bool  wxICONResourceHandler::LoadFile(
     return false;
 }
 
     return false;
 }
 

+#endif
+

diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index d5e113408ad7d3346152aa54351677bd8d7315b3..20f586b946b641e54aa9cc407ad13f74059342f0 100644 (file)
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -10,6 +10,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxOSX_USE_COCOA_OR_CARBON
+

 #include "wx/region.h"
 
 #ifndef WX_PRECOMP
 #include "wx/region.h"
 
 #ifndef WX_PRECOMP


@@ -606,3 +608,5 @@ long wxRegionIterator::GetH() const
 
     return 0;
 }
 
     return 0;
 }

+
+#endif

diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index fd3b471abf6a84cff35a0416890fcb45e885539b..cf8c734dc33dfdc6eebb9fdd91ac5a115dd4892c 100644 (file)
--- a/src/osx/carbon/renderer.cpp
+++ b/src/osx/carbon/renderer.cpp
@@ -12,6 +12,8 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxOSX_USE_COCOA_OR_CARBON
+

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif


@@ -806,3 +808,5 @@ void wxRendererMac::DrawTitleBarBitmap(wxWindow *win,
 }
 
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 }
 
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP

+
+#endif
\ No newline at end of file

diff --git a/src/osx/core/glgrab.cpp b/src/osx/core/glgrab.cpp
index ccb2ff76ad51cc6b99e182d2a8fe64fe01fa8d0b..99ffa2b08597db80306c55841be6ede8b28e39b3 100644 (file)
--- a/src/osx/core/glgrab.cpp
+++ b/src/osx/core/glgrab.cpp
@@ -30,6 +30,8 @@
  OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

+#if wxOSX_USE_COCOA_OR_CARBON
+

 #import <CoreFoundation/CoreFoundation.h>
 #import <ApplicationServices/ApplicationServices.h>
 #import <OpenGL/OpenGL.h>
 #import <CoreFoundation/CoreFoundation.h>
 #import <ApplicationServices/ApplicationServices.h>
 #import <OpenGL/OpenGL.h>


@@ -212,3 +214,4 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     return image;
 }
 
     return image;
 }
 

+#endif

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index 3bc287cb1738a2b15707e45eb44a202e718b3ae4..0f00fca27555df3c58219d6fd883de7e065728e1 100644 (file)
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -24,8 +24,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-//DARWIN _ONLY_
-#ifdef __DARWIN__
+#if wxOSX_USE_COCOA_OR_CARBON

 
 #include "wx/osx/core/hid.h"
 
 
 #include "wx/osx/core/hid.h"
 

diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index 0e452bdd6bbefa09a8c1d292692204c90f6c585e..a0f40869f542235ee7fc9a38d500923e6e8a3a0b 100644 (file)
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -33,8 +33,6 @@
 #include "wx/msw/private.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/private.h"
 #include "wx/msw/private.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/private.h"

-// only for kThemeBrushToolbarBackground
-#include <Carbon/Carbon.h>

 #endif
 
 wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()
 #endif
 
 wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()