Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rearranging contentview, adding toolbar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-12-12 14:01:28 +00:00
parent de7cb655ae
commit 9804064630
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/osx/iphone/chkconf.h
View File

@@ -120,10 +120,8 @@
#define wxUSE_RADIOBOX 0 #define wxUSE_RADIOBOX 0
#define wxUSE_TOGGLEBTN 0 #define wxUSE_TOGGLEBTN 0
#undef wxUSE_TOOLBAR
#undef wxUSE_HTML #undef wxUSE_HTML
#define wxUSE_TOOLBAR 0
#define wxUSE_HTML 0 #define wxUSE_HTML 0
#undef wxUSE_RICHTEXT #undef wxUSE_RICHTEXT
@@ -292,6 +290,13 @@
#define wxUSE_COLOURDLG 0 #define wxUSE_COLOURDLG 0
#endif // wxUSE_COLOURDLG #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 #endif
/* _WX_OSX_IPHONE_CHKCONF_H_ */ /* _WX_OSX_IPHONE_CHKCONF_H_ */

6
include/wx/osx/iphone/private.h
View File

@@ -195,6 +195,12 @@ protected :
@end @end
@interface wxUIView : UIView
{
}
@end // wxUIView
void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c); void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
#endif #endif