rearranging contentview, adding toolbar

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

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index 5810f718593106c2a6683995ea32f91cb1bdb0ed..dd53b32f50ca0f1b3395e9aaa607de5af99fbf3c 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -120,10 +120,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
@@ -292,6 +290,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_ */
 

diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index fa5cbd5f145ea8f97475a204d5df137eeb422e1f..4faad3d7bfe5c22589468b6135c13124d15d0204 100644 (file)
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -195,6 +195,12 @@ protected :
 
     @end
 
+    @interface wxUIView : UIView
+    {
+    }
+
+    @end // wxUIView
+
     void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
 
 #endif