X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65536c9221c62262cca9b76431bc1fdaf4886a3b..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/iphone/nonownedwnd.mm diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm index ba4386f279..1be798fb72 100644 --- 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 -// RCS-ID: $Id: nonownedwnd.mm 48805 2007-09-19 14:52:25Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,6 +15,7 @@ #include "wx/nonownedwnd.h" #include "wx/frame.h" +#include CGRect wxToNSRect(UIView* parent, const wxRect& r ) { @@ -48,6 +49,26 @@ wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p ) return wxPoint( x, y); } +@interface wxUIContentViewController : UIViewController +{ +} + +@end + +@interface wxUIContentView : UIView +{ + wxUIContentViewController* _controller; +} + +- (void) setController: (wxUIContentViewController*) controller; +- (wxUIContentViewController*) controller; +@end + + + +// +// c++ impl +// IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowIPhoneImpl , wxNonOwnedWindowImpl ) @@ -56,12 +77,14 @@ wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonown { m_macWindow = NULL; m_macFullScreenData = NULL; + m_initialShowSent = false; } wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl() { m_macWindow = NULL; m_macFullScreenData = NULL; + m_initialShowSent = false; } wxNonOwnedWindowIPhoneImpl::~wxNonOwnedWindowIPhoneImpl() @@ -69,9 +92,8 @@ wxNonOwnedWindowIPhoneImpl::~wxNonOwnedWindowIPhoneImpl() [m_macWindow release]; } -void wxNonOwnedWindowIPhoneImpl::Destroy() +void wxNonOwnedWindowIPhoneImpl::WillBeDestroyed() { - wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) ); } void wxNonOwnedWindowIPhoneImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, @@ -104,11 +126,18 @@ long style, long extraStyle, const wxString& name ) if ( ( style & wxSTAY_ON_TOP ) ) level = UIWindowLevelAlert; CGRect r = CGRectMake( 0, 0, size.x, size.y) ; + if ( UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) ) + std::swap(r.size.width,r.size.height); [m_macWindow initWithFrame:r ]; + [m_macWindow setHidden:YES]; [m_macWindow setWindowLevel:level]; - // [m_macWindow makeKeyAndOrderFront:nil]; +} + +void wxNonOwnedWindowIPhoneImpl::Create( wxWindow* WXUNUSED(parent), WXWindow nativeWindow ) +{ + m_macWindow = nativeWindow; } @@ -130,6 +159,16 @@ bool wxNonOwnedWindowIPhoneImpl::Show(bool show) [m_macWindow setHidden:(show ? NO : YES)]; if ( show ) { + if ( !m_initialShowSent ) + { + wxNonOwnedWindow* now = dynamic_cast (GetWXPeer()); + wxShowEvent eventShow(now->GetId(), true); + eventShow.SetEventObject(now); + + now->HandleWindowEvent(eventShow); + + m_initialShowSent = true; + } //[m_macWindow orderFront: self]; [m_macWindow makeKeyWindow]; } @@ -175,6 +214,9 @@ bool wxNonOwnedWindowIPhoneImpl::CanSetTransparent() void wxNonOwnedWindowIPhoneImpl::MoveWindow(int x, int y, int width, int height) { CGRect r = CGRectMake( x,y,width,height) ; + if ( UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) ) + std::swap(r.size.width,r.size.height); + [m_macWindow setFrame:r]; } @@ -187,18 +229,22 @@ void wxNonOwnedWindowIPhoneImpl::GetPosition( int &x, int &y ) const void wxNonOwnedWindowIPhoneImpl::GetSize( int &width, int &height ) const { - CGRect rect = [m_macWindow frame]; - width = rect.size.width; - height = rect.size.height; + CGRect r = [m_macWindow frame]; + if ( UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) ) + std::swap(r.size.width,r.size.height); + width = r.size.width; + height = r.size.height; } void wxNonOwnedWindowIPhoneImpl::GetContentArea( int& left, int &top, int &width, int &height ) const { - CGRect rect = [m_macWindow bounds]; - width = rect.size.width; - height = rect.size.height; - left = rect.origin.x; - top = rect.origin.y; + CGRect r = [m_macWindow bounds]; + if ( UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) ) + std::swap(r.size.width,r.size.height); + width = r.size.width; + height = r.size.height; + left = r.origin.x; + top = r.origin.y; } bool wxNonOwnedWindowIPhoneImpl::SetShape(const wxRegion& region) @@ -227,6 +273,11 @@ void wxNonOwnedWindowIPhoneImpl::Iconize( bool iconize ) void wxNonOwnedWindowIPhoneImpl::Maximize(bool maximize) { + if ( maximize ) + { + CGRect r = [[UIScreen mainScreen] bounds]; + [m_macWindow setFrame:r]; + } } bool wxNonOwnedWindowIPhoneImpl::IsFullScreen() const @@ -263,6 +314,14 @@ void wxNonOwnedWindowIPhoneImpl::WindowToScreen( int *x, int *y ) *y = p.y; } +wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow nativeWindow) +{ + wxNonOwnedWindowIPhoneImpl* now = new wxNonOwnedWindowIPhoneImpl( wxpeer ); + now->Create( parent, nativeWindow ); + return now; +} + + wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) { @@ -270,3 +329,158 @@ wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWind now->Create( parent, pos, size, style , extraStyle, name ); return now; } + +wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) +{ + UIWindow* toplevelwindow = now->GetWXWindow(); + CGRect frame = [toplevelwindow bounds]; + CGRect appframe = [[UIScreen mainScreen] applicationFrame]; + BOOL fullscreen = now->GetWindowStyle() == wxDEFAULT_FRAME_STYLE && [[UIApplication sharedApplication] statusBarStyle] == UIStatusBarStyleBlackTranslucent; + + 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; +#endif + + controller.view = contentview; + [contentview release]; + [contentview setController:controller]; + [contentview setHidden:YES]; + + wxWidgetIPhoneImpl* impl = new wxWidgetIPhoneImpl( now, contentview, true ); + impl->InstallEventHandler(); + + if ([toplevelwindow respondsToSelector:@selector(setRootViewController:)]) + { + toplevelwindow.rootViewController = controller; + } + else + { + [toplevelwindow addSubview:contentview]; + } + return impl; +} + +// +// obj-c impl +// + +@implementation wxUIContentView + +- (void) setController: (wxUIContentViewController*) controller +{ + _controller = controller; +} + +- (wxUIContentViewController*) controller +{ + return _controller; +} + ++ (void)initialize +{ + static BOOL initialized = NO; + if (!initialized) + { + initialized = YES; + wxOSXIPhoneClassAddWXMethods( self ); + } +} + +@end + +@implementation wxUIContentViewController + +- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation +{ + wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] ); + wxNonOwnedWindow* now = dynamic_cast (impl->GetWXPeer()); + + // TODO: determine NO or YES based on min size requirements (whether it fits on the new orientation) + + return YES; +} + +// iOS 6 support, right now unconditionally supporting all orientations, TODO use a orientation mask + +-(BOOL)shouldAutorotate +{ + return YES; +} + + - (NSUInteger)supportedInterfaceOrientations +{ + return UIInterfaceOrientationMaskAll; +} + + + + +- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation +{ + wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] ); + wxNonOwnedWindow* now = dynamic_cast (impl->GetWXPeer()); + + now->HandleResized(0); +} + +-(void) viewWillAppear:(BOOL)animated +{ + wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] ); + wxNonOwnedWindow* now = dynamic_cast (impl->GetWXPeer()); + wxNonOwnedWindowIPhoneImpl* nowimpl = dynamic_cast (now->GetNonOwnedPeer()); + + if ( nowimpl->InitialShowEventSent() ) + { + wxShowEvent eventShow(now->GetId(), true); + eventShow.SetEventObject(now); + + now->HandleWindowEvent(eventShow); + } +} + +-(void) viewWillDisappear:(BOOL)animated +{ + wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] ); + if( impl ) + { + wxNonOwnedWindow* now = dynamic_cast (impl->GetWXPeer()); + wxNonOwnedWindowIPhoneImpl* nowimpl = dynamic_cast (now->GetNonOwnedPeer()); + + if ( nowimpl->InitialShowEventSent() ) + { + wxShowEvent eventShow(now->GetId(), false); + eventShow.SetEventObject(now); + + now->HandleWindowEvent(eventShow); + } + } +} + +-(void) dealloc +{ + [super dealloc]; +} + +- (UIView*) rotatingFooterView +{ + UIView* footerView = [super rotatingFooterView]; + if ( footerView == nil ) + { + wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] ); + wxFrame* frame = dynamic_cast (impl->GetWXPeer()); + if ( frame && frame->GetToolBar()) + { + footerView = frame->GetToolBar()->GetHandle(); + } + } + return footerView; +} + +@end + + +