iPhone SDK 2.2 compilation

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

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index 7b55544335a73c80b895a16f4d61982a9e585bd8..d86f2de9fadb8d8cafca7870bc41ce142c5ddf9e 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -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
 #undef wxUSE_MDI
 #define wxUSE_MDI 0
 #if wxUSE_MDI
 #undef wxUSE_MDI
 #define wxUSE_MDI 0

diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm
index 87018de7b85e67da31d680b760cb438f5f9941be..9c14e09ac387e4937f5ff5560b769fd0be7bf02c 100644 (file)
--- a/src/osx/iphone/nonownedwnd.mm
+++ b/src/osx/iphone/nonownedwnd.mm
@@ -335,7 +335,11 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     wxUIContentView* contentview = [[wxUIContentView alloc] initWithFrame:( fullscreen ? frame : appframe ) ];
     contentview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     wxUIContentViewController* controller = [[wxUIContentViewController alloc] initWithNibName:nil bundle:nil];
     wxUIContentView* contentview = [[wxUIContentView alloc] initWithFrame:( fullscreen ? frame : appframe ) ];
     contentview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     wxUIContentViewController* controller = [[wxUIContentViewController alloc] initWithNibName:nil bundle:nil];

+
+#ifdef __IPHONE_3_0

     controller.wantsFullScreenLayout = fullscreen;
     controller.wantsFullScreenLayout = fullscreen;

+#endif
+

     controller.view = contentview;
     [contentview release];
     [contentview setController:controller];
     controller.view = contentview;
     [contentview release];
     [contentview setController:controller];

diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm
index e77c140fd3b96eca96c6a90ff5647812d75e000f..4892a57e826cb131240917f2f1739e3a5db08e0d 100644 (file)
--- a/src/osx/iphone/toolbar.mm
+++ b/src/osx/iphone/toolbar.mm
@@ -227,6 +227,7 @@ bool wxToolBar::Create(
     
     switch ( [[UIApplication sharedApplication] statusBarStyle] ) 
     {
     
     switch ( [[UIApplication sharedApplication] statusBarStyle] ) 
     {

+#ifdef __IPHONE_3_0

         case UIStatusBarStyleBlackOpaque:
             toolbar.barStyle = UIBarStyleBlack;
             break;
         case UIStatusBarStyleBlackOpaque:
             toolbar.barStyle = UIBarStyleBlack;
             break;


@@ -234,6 +235,7 @@ bool wxToolBar::Create(
             toolbar.barStyle = UIBarStyleBlack;
             toolbar.translucent = YES;
             break;
             toolbar.barStyle = UIBarStyleBlack;
             toolbar.translucent = YES;
             break;

+#endif

         default:
             toolbar.barStyle = UIBarStyleDefault;
             break;
         default:
             toolbar.barStyle = UIBarStyleDefault;
             break;