AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

supporting rotated display correctly for display size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2009-09-13 17:33:46 +00:00
parent 4e16d05a28
commit 62018605a1
1 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/osx/iphone/utils.mm
View File

@ -77,8 +77,8 @@ bool wxApp::CallOnInit()
int wxApp::OnRun()
{
wxMacAutoreleasePool pool;
char* appname = "test";
UIApplicationMain( 1, &appname, nil, @"wxAppDelegate" );
const char* appname = "app";
UIApplicationMain( 1, (char**) &appname, nil, @"wxAppDelegate" );
return 1;
}
@ -137,15 +137,31 @@ extern CGSize MeasureTextInContext( UIFont *font, NSString* text )
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
CGRect r = [[UIScreen mainScreen] applicationFrame];
if ( x )
*x = r.origin.x;
if ( y )
*y = r.origin.y;
if ( width )
*width = r.size.width;
if ( height )
*height = r.size.height;
CGRect bounds = [[UIScreen mainScreen] bounds];
if ( bounds.size.height > r.size.height )
{
// portrait
if ( x )
*x = r.origin.x;
if ( y )
*y = r.origin.y;
if ( width )
*width = r.size.width;
if ( height )
*height = r.size.height;
}
else
{
// landscape
if ( x )
*x = r.origin.y;
if ( y )
*y = r.origin.x;
if ( width )
*width = r.size.height;
if ( height )
*height = r.size.width;
}
}
void wxGetMousePosition( int* x, int* y )
@ -162,12 +178,25 @@ int wxDisplayDepth()
// Get size of display
void wxDisplaySize(int *width, int *height)
{
CGRect r = [[UIScreen mainScreen] applicationFrame];
CGRect bounds = [[UIScreen mainScreen] bounds];
if ( width )
*width = (int)bounds.size.width ;
if ( height )
*height = (int)bounds.size.height;
if ( bounds.size.height > r.size.height )
{
// portrait
if ( width )
*width = (int)bounds.size.width ;
if ( height )
*height = (int)bounds.size.height;
}
else
{
// landscape
if ( width )
*width = (int)bounds.size.height ;
if ( height )
*height = (int)bounds.size.width;
}
}
wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)