#include "wx/nonownedwnd.h"
#include "wx/frame.h"
+#include <algorithm>
+
+CGRect wxToNSRect(UIView* parent, const wxRect& r )
+{
+ CGRect frame = parent ? [parent bounds] : [[UIScreen mainScreen] bounds];
+ int y = r.y;
+ int x = r.x ;
+ return CGRectMake(x, y, r.width , r.height);
+}
+
+wxRect wxFromNSRect( UIView* parent, const CGRect& rect )
+{
+ CGRect frame = parent ? [parent bounds] : [[UIScreen mainScreen] bounds];
+ int y = rect.origin.y;
+ int x = rect.origin.x;
+ return wxRect( x, y, rect.size.width, rect.size.height );
+}
+
+CGPoint wxToNSPoint( UIView* parent, const wxPoint& p )
+{
+ CGRect frame = parent ? [parent bounds] : [[UIScreen mainScreen] bounds];
+ int x = p.x ;
+ int y = p.y;
+ return CGPointMake(x, y);
+}
+
+wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p )
+{
+ CGRect frame = parent ? [parent bounds] : [[UIScreen mainScreen] bounds];
+ int x = p.x;
+ int y = p.y;
+ return wxPoint( x, y);
+}
+
+@interface wxUIContentViewController : UIViewController
+{
+}
+
+@end
+
+@interface wxUIContentView : wxUIView
+{
+ wxUIContentViewController* _controller;
+}
+
+- (void) setController: (UIViewController*) controller;
+- (UIViewController*) controller;
+@end
+
+
+
+//
+// c++ impl
+//
IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowIPhoneImpl , wxNonOwnedWindowImpl )
-wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) :
+wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) :
wxNonOwnedWindowImpl(nonownedwnd)
{
m_macWindow = NULL;
m_macFullScreenData = NULL;
}
-
-wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl()
+
+wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl()
{
m_macWindow = NULL;
m_macFullScreenData = NULL;
}
-
+
wxNonOwnedWindowIPhoneImpl::~wxNonOwnedWindowIPhoneImpl()
{
[m_macWindow release];
long style, long extraStyle, const wxString& name )
{
m_macWindow = [UIWindow alloc];
-
+
UIWindowLevel level = UIWindowLevelNormal;
-
+
// most styles are not supported on the iphone
-
+
if ( style & wxFRAME_TOOL_WINDOW )
{
level = UIWindowLevelAlert; ;
}
if ( ( style & wxSTAY_ON_TOP ) )
- level = UIWindowLevelAlert;
+ 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 setWindowLevel:level];
// [m_macWindow makeKeyAndOrderFront:nil];
}
void wxNonOwnedWindowIPhoneImpl::Raise()
{
}
-
+
void wxNonOwnedWindowIPhoneImpl::Lower()
{
}
}
return true;
}
-
+
bool wxNonOwnedWindowIPhoneImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout)
{
return Show(show);
{
// no special styles supported
}
-
+
bool wxNonOwnedWindowIPhoneImpl::SetBackgroundStyle(wxBackgroundStyle style)
{
return true;
}
-
+
bool wxNonOwnedWindowIPhoneImpl::CanSetTransparent()
{
return true;
void wxNonOwnedWindowIPhoneImpl::MoveWindow(int x, int y, int width, int height)
{
- CGRect r = CGRectMake( 0,0,width,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];
}
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 &right, int &width, int &height ) const
+void wxNonOwnedWindowIPhoneImpl::GetContentArea( int& left, int &top, int &width, int &height ) const
{
- CGRect rect = [m_macWindow frame];
- width = rect.size.width;
- height = rect.size.height;
- left = 0;
- right = 0;
+ 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)
{
return false;
}
-void wxNonOwnedWindowIPhoneImpl::SetTitle( const wxString& title, wxFontEncoding encoding )
+void wxNonOwnedWindowIPhoneImpl::SetTitle( const wxString& title, wxFontEncoding encoding )
{
// TODO change title of app ?
}
-
+
bool wxNonOwnedWindowIPhoneImpl::IsMaximized() const
{
return false;
}
-
+
bool wxNonOwnedWindowIPhoneImpl::IsIconized() const
{
return false;
}
-
+
void wxNonOwnedWindowIPhoneImpl::Iconize( bool iconize )
{
}
-
+
void wxNonOwnedWindowIPhoneImpl::Maximize(bool maximize)
{
}
{
return m_macFullScreenData != NULL ;
}
-
+
bool wxNonOwnedWindowIPhoneImpl::ShowFullScreen(bool show, long style)
-{
+{
return true;
}
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];
+
+ if ( now->GetWindowStyle() == wxDEFAULT_FRAME_STYLE )
+ {
+ double offset = appframe.origin.y;
+ frame.origin.y += offset;
+ frame.size.height -= offset;
+ }
+
+ wxUIContentView* contentview = [[wxUIContentView alloc] initWithFrame:frame];
+ contentview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ wxUIContentViewController* controller = [[wxUIContentViewController alloc] init];
+ controller.view = contentview;
+ [contentview setController:controller];
+
+ wxWidgetIPhoneImpl* impl = new wxWidgetIPhoneImpl( now, contentview, true );
+ impl->InstallEventHandler();
+ [toplevelwindow addSubview:contentview];
+ return impl;
+}
+
+//
+// obj-c impl
+//
+
+@implementation wxUIContentView
+
+- (void) setController: (UIViewController*) controller
+{
+ _controller = controller;
+}
+
+- (UIViewController*) controller
+{
+ return _controller;
+}
+
+@end
+
+@implementation wxUIContentViewController
+
+- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation
+{
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] );
+ wxNonOwnedWindow* now = dynamic_cast<wxNonOwnedWindow*> (impl->GetWXPeer());
+
+ // TODO: determine NO or YES based on min size requirements (whether it fits on the new orientation)
+
+ return YES;
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+ CGRect fr = [self.view frame];
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] );
+ wxNonOwnedWindow* now = dynamic_cast<wxNonOwnedWindow*> (impl->GetWXPeer());
+
+ now->HandleResized(0);
+}
+
+-(void) dealloc
+{
+ [super dealloc];
+}
+
+- (UIView*) rotatingFooterView
+{
+ UIView* footerView = [super rotatingFooterView];
+ if ( footerView == nil )
+ {
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] );
+ wxFrame* frame = dynamic_cast<wxFrame*> (impl->GetWXPeer());
+ if ( frame && frame->GetToolBar())
+ {
+ footerView = frame->GetToolBar()->GetHandle();
+ }
+ }
+}
+
+@end
+
+
+
projects / wxWidgets.git / blobdiff