iPhone SDK 2.2 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,6 +31,11 @@
|
|||||||
* turning off capabilities that don't work under iphone yet
|
* turning off capabilities that don't work under iphone yet
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if wxUSE_MIMETYPE
|
||||||
|
#undef wxUSE_MIMETYPE
|
||||||
|
#define wxUSE_MIMETYPE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
#if wxUSE_MDI
|
#if wxUSE_MDI
|
||||||
#undef wxUSE_MDI
|
#undef wxUSE_MDI
|
||||||
#define wxUSE_MDI 0
|
#define wxUSE_MDI 0
|
||||||
|
@@ -335,7 +335,11 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
|
|||||||
wxUIContentView* contentview = [[wxUIContentView alloc] initWithFrame:( fullscreen ? frame : appframe ) ];
|
wxUIContentView* contentview = [[wxUIContentView alloc] initWithFrame:( fullscreen ? frame : appframe ) ];
|
||||||
contentview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
contentview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
||||||
wxUIContentViewController* controller = [[wxUIContentViewController alloc] initWithNibName:nil bundle:nil];
|
wxUIContentViewController* controller = [[wxUIContentViewController alloc] initWithNibName:nil bundle:nil];
|
||||||
|
|
||||||
|
#ifdef __IPHONE_3_0
|
||||||
controller.wantsFullScreenLayout = fullscreen;
|
controller.wantsFullScreenLayout = fullscreen;
|
||||||
|
#endif
|
||||||
|
|
||||||
controller.view = contentview;
|
controller.view = contentview;
|
||||||
[contentview release];
|
[contentview release];
|
||||||
[contentview setController:controller];
|
[contentview setController:controller];
|
||||||
|
@@ -227,6 +227,7 @@ bool wxToolBar::Create(
|
|||||||
|
|
||||||
switch ( [[UIApplication sharedApplication] statusBarStyle] )
|
switch ( [[UIApplication sharedApplication] statusBarStyle] )
|
||||||
{
|
{
|
||||||
|
#ifdef __IPHONE_3_0
|
||||||
case UIStatusBarStyleBlackOpaque:
|
case UIStatusBarStyleBlackOpaque:
|
||||||
toolbar.barStyle = UIBarStyleBlack;
|
toolbar.barStyle = UIBarStyleBlack;
|
||||||
break;
|
break;
|
||||||
@@ -234,6 +235,7 @@ bool wxToolBar::Create(
|
|||||||
toolbar.barStyle = UIBarStyleBlack;
|
toolbar.barStyle = UIBarStyleBlack;
|
||||||
toolbar.translucent = YES;
|
toolbar.translucent = YES;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
toolbar.barStyle = UIBarStyleDefault;
|
toolbar.barStyle = UIBarStyleDefault;
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user