summaryrefslogtreecommitdiff
path: root/src/Fl_Device.cxx
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-03-04 16:48:10 +0000
committerManolo Gouy <Manolo>2011-03-04 16:48:10 +0000
commit1d038565c1aab91cc35411a617aa864387a603c6 (patch)
tree6a6138f5561f3684448ea5726b1ac93ce3a71a23 /src/Fl_Device.cxx
parent704ecc048a14a3d9673780469eb6c2d90130f3dd (diff)
Mac OS: modified the definition of the fl_mac_os_version global variable to allow v 10.10.10
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8504 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Device.cxx')
-rw-r--r--src/Fl_Device.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx
index 2a7ff08be..1bbf0660d 100644
--- a/src/Fl_Device.cxx
+++ b/src/Fl_Device.cxx
@@ -74,9 +74,13 @@ void Fl_Graphics_Driver::text_extents(const char*t, int n, int& dx, int& dy, int
Fl_Display_Device::Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_Surface_Device( graphics_driver) {
#ifdef __APPLE__
- SInt32 version;
- Gestalt(gestaltSystemVersion, &version);
- fl_mac_os_version = (int)version;
+ SInt32 versionMajor = 0;
+ SInt32 versionMinor = 0;
+ SInt32 versionBugFix = 0;
+ Gestalt( gestaltSystemVersionMajor, &versionMajor );
+ Gestalt( gestaltSystemVersionMinor, &versionMinor );
+ Gestalt( gestaltSystemVersionBugFix, &versionBugFix );
+ fl_mac_os_version = versionMajor * 10000 + versionMinor * 100 + versionBugFix;
#endif
};