Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / osx / iphone / nonownedwnd.mm

diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm
index 1d73fd09ed63f3c2cbaa4a2ee898f89c5f499137..53168f0dafc5e87feae8a4bede9a886d38b0922a 100644 (file)
--- a/src/osx/iphone/nonownedwnd.mm
+++ b/src/osx/iphone/nonownedwnd.mm
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/cocoa/nonownedwnd.mm
+// Name:        src/osx/iphone/nonownedwnd.mm

 // Purpose:     non owned window for iphone
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20
 // Purpose:     non owned window for iphone
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20

-// RCS-ID:      $Id: nonownedwnd.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -55,7 +55,7 @@ wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p )
 
 @end
 
 
 @end
 

-@interface wxUIContentView : wxUIView
+@interface wxUIContentView : UIView

 {
     wxUIContentViewController* _controller;
 }
 {
     wxUIContentViewController* _controller;
 }


@@ -275,7 +275,7 @@ void wxNonOwnedWindowIPhoneImpl::Maximize(bool maximize)
 {
     if ( maximize )
     {
 {
     if ( maximize )
     {

-        CGRect r = [[UIScreen mainScreen] applicationFrame];
+        CGRect r = [[UIScreen mainScreen] bounds];

         [m_macWindow setFrame:r];
     }
 }
         [m_macWindow setFrame:r];
     }
 }


@@ -372,6 +372,16 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     return _controller;
 }
 
     return _controller;
 }
 

++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized)
+    {
+        initialized = YES;
+        wxOSXIPhoneClassAddWXMethods( self );
+    }
+}
+ 

 @end
 
 @implementation wxUIContentViewController
 @end
 
 @implementation wxUIContentViewController