X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..4cb0e8d05cadea6be3a7bd93f1fea9a9e0df95f0:/include/wx/osx/iphone/chkconf.h

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index 91892e86bc..dd53b32f50 100644
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -24,6 +24,9 @@
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 
+#define wxOSX_USE_QUICKTIME 0
+#define wxOSX_USE_AUDIOTOOLBOX 1
+
 /*
  * turning off capabilities that don't work under iphone yet
  */
@@ -85,8 +88,10 @@
 #define wxUSE_COMBOBOX 0
 #endif
 
-#undef wxUSE_SCROLLBAR
+#ifndef __WXUNIVERSAL__
+#undef wxUSE_SCROLLBAR 
 #define wxUSE_SCROLLBAR 0
+#endif
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR
@@ -97,7 +102,6 @@
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
 #undef wxUSE_STATBOX
-#undef wxUSE_CHECKBOX
 #undef wxUSE_RADIOBTN
 #undef wxUSE_RADIOBOX
 #undef wxUSE_TOGGLEBTN
@@ -112,15 +116,12 @@
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
 #define wxUSE_STATBOX 0
-#define wxUSE_CHECKBOX 0
 #define wxUSE_RADIOBTN 0
 #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
@@ -277,17 +278,25 @@
 #define wxUSE_CLIPBOARD 0
 #endif // wxUSE_CLIPBOARD
 
+/*
 #if wxUSE_GLCANVAS
 #undef wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0
 #endif // wxUSE_GLCANVAS
-
+*/
 
 #if wxUSE_COLOURDLG
 #undef wxUSE_COLOURDLG
 #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_ */