X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/719ddf1e4ebb44e34aa6ad0af1788d03c9d1322b..b2e04188bd940ce8933394fee71790c9887ba32c:/include/wx/osx/iphone/chkconf.h?ds=sidebyside

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index caf0a2ff57..ac6161a62c 100644
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -31,6 +31,11 @@
  * turning off capabilities that don't work under iphone yet
  */
 
+#if wxUSE_MIMETYPE
+#undef wxUSE_MIMETYPE
+#define wxUSE_MIMETYPE 0
+#endif
+
 #if wxUSE_MDI
 #undef wxUSE_MDI
 #define wxUSE_MDI 0
@@ -89,7 +94,7 @@
 #endif
 
 #ifndef __WXUNIVERSAL__
-#undef wxUSE_SCROLLBAR 
+#undef wxUSE_SCROLLBAR
 #define wxUSE_SCROLLBAR 0
 #endif
 
@@ -284,10 +289,49 @@
 
 // iphone has a toolbar that is a regular UIView
 
+#ifdef wxOSX_USE_NATIVE_TOOLBAR
 #if wxOSX_USE_NATIVE_TOOLBAR
 #undef wxOSX_USE_NATIVE_TOOLBAR
 #define wxOSX_USE_NATIVE_TOOLBAR 0
 #endif
+#else
+#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_ */