keep older version for iOS, CGDisplay doesn't exist there
This commit is contained in:
parent
e2e99f5c91
commit
5276800576
@ -150,11 +150,23 @@ bool wxDoLaunchDefaultBrowser(const wxLaunchBrowserParams& params)
|
|||||||
|
|
||||||
void wxDisplaySizeMM(int *width, int *height)
|
void wxDisplaySizeMM(int *width, int *height)
|
||||||
{
|
{
|
||||||
|
#if wxOSX_USE_IPHONE
|
||||||
|
wxDisplaySize(width, height);
|
||||||
|
// on mac 72 is fixed (at least now;-)
|
||||||
|
double cvPt2Mm = 25.4 / 72;
|
||||||
|
|
||||||
|
if (width != NULL)
|
||||||
|
*width = int( *width * cvPt2Mm );
|
||||||
|
|
||||||
|
if (height != NULL)
|
||||||
|
*height = int( *height * cvPt2Mm );
|
||||||
|
#else
|
||||||
CGSize size = CGDisplayScreenSize(CGMainDisplayID());
|
CGSize size = CGDisplayScreenSize(CGMainDisplayID());
|
||||||
if ( width )
|
if ( width )
|
||||||
*width = (int)size.width ;
|
*width = (int)size.width ;
|
||||||
if ( height )
|
if ( height )
|
||||||
*height = (int)size.height;
|
*height = (int)size.height;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user