X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0770c0a05faf7a863af7d8e7fd203401265d0fac..dfbb5eff442e9bcabd494f0340553fbf49739b25:/include/wx/osx/iphone/chkconf.h

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index 5810f71859..caf0a2ff57 100644
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -95,9 +95,7 @@
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR
-#undef wxUSE_TEXTCTRL
 #undef wxUSE_ABOUTDLG
-#undef wxUSE_STATTEXT
 #undef wxUSE_STATLINE
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
@@ -109,9 +107,7 @@
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0
-#define wxUSE_TEXTCTRL 0
 #define wxUSE_ABOUTDLG 0
-#define wxUSE_STATTEXT 0
 #define wxUSE_STATLINE 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
@@ -120,10 +116,8 @@
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0
 
-#undef wxUSE_TOOLBAR
 #undef wxUSE_HTML
 
-#define wxUSE_TOOLBAR 0
 #define wxUSE_HTML 0
 
 #undef wxUSE_RICHTEXT
@@ -136,12 +130,10 @@
 #undef wxUSE_BITMAPCOMBOBOX
 #undef wxUSE_BMPBUTTON
 #undef wxUSE_CHECKLISTBOX
-#undef wxUSE_GAUGE
 #undef wxUSE_GRID
 #undef wxUSE_LISTBOX
 #undef wxUSE_LISTCTRL
 #undef wxUSE_NOTEBOOK
-#undef wxUSE_SLIDER
 #undef wxUSE_SPINBTN
 #undef wxUSE_SPINCTRL
 #undef wxUSE_TREECTRL
@@ -167,12 +159,10 @@
 #define wxUSE_BITMAPCOMBOBOX 0
 #define wxUSE_BMPBUTTON 0
 #define wxUSE_CHECKLISTBOX 0
-#define wxUSE_GAUGE 0
 #define wxUSE_GRID 0
 #define wxUSE_LISTBOX 0
 #define wxUSE_LISTCTRL 0
 #define wxUSE_NOTEBOOK 0
-#define wxUSE_SLIDER 0
 #define wxUSE_SPINBTN 0
 #define wxUSE_SPINCTRL 0
 #define wxUSE_TREECTRL 0
@@ -292,6 +282,13 @@
 #define wxUSE_COLOURDLG 0
 #endif // wxUSE_COLOURDLG
 
+// iphone has a toolbar that is a regular UIView
+
+#if wxOSX_USE_NATIVE_TOOLBAR
+#undef wxOSX_USE_NATIVE_TOOLBAR
+#define wxOSX_USE_NATIVE_TOOLBAR 0
+#endif
+
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */