diff options
| author | Manolo Gouy <Manolo> | 2011-01-07 14:47:02 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-01-07 14:47:02 +0000 |
| commit | 97fce6b74828ec09322d7824ae728f04c6a4c06d (patch) | |
| tree | 49528e29305e3f2a6f684153f2143977c5d24a68 | |
| parent | 8197ba8d9bce744ba6a88df0b75a705f4465a0e2 (diff) | |
Removed requirement of Mac OS 10.4 because of use of [NSScreen userSpaceScaleFactor]
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_cocoa.mm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index a61efb0a2..a38ee69bf 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2719,16 +2719,26 @@ int Fl_X::screen_init(XRectangle screens[], float dpi[]) { NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init]; NSArray *a = [NSScreen screens]; + NSScreen *object; int count = (int)[a count]; NSRect r; int i, num_screens = 0; for( i = 0; i < count; i++) { - r = [[a objectAtIndex:i] frame]; + object = (NSScreen*)[a objectAtIndex:i]; + r = [object frame]; screens[num_screens].x = int(r.origin.x); screens[num_screens].y = int(r.size.height - (r.origin.y + r.size.height)); screens[num_screens].width = int(r.size.width); screens[num_screens].height = int(r.size.height); - dpi[num_screens] = float([[a objectAtIndex:i] userSpaceScaleFactor])*72.0f; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + if ([object respondsToSelector:@selector(userSpaceScaleFactor)]) { + dpi[num_screens] = float([object userSpaceScaleFactor])*72.0f; + } else +#endif + { + dpi[num_screens] = 72.0f; + } + num_screens ++; if (num_screens >= 16) break; } |
