Author: manolo
Date: 2012-01-13 11:04:10 -0800 (Fri, 13 Jan 2012)
New Revision: 9227
Log:
Remove compilation error under Mac OS 10.3
Modified:
branches/branch-1.3/src/Fl_Device.cxx
Modified: branches/branch-1.3/src/Fl_Device.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Device.cxx 2012-01-13 11:51:53 UTC (rev
9226)
+++ branches/branch-1.3/src/Fl_Device.cxx 2012-01-13 19:04:10 UTC (rev
9227)
@@ -68,9 +68,22 @@
SInt32 versionMajor = 0;
SInt32 versionMinor = 0;
SInt32 versionBugFix = 0;
- Gestalt( gestaltSystemVersionMajor, &versionMajor );
- Gestalt( gestaltSystemVersionMinor, &versionMinor );
- Gestalt( gestaltSystemVersionBugFix, &versionBugFix );
+ SInt32 version;
+ Gestalt( gestaltSystemVersion, &version);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ if (version >= 0x1040) {
+ Gestalt( gestaltSystemVersionMajor, &versionMajor );
+ Gestalt( gestaltSystemVersionMinor, &versionMinor );
+ Gestalt( gestaltSystemVersionBugFix, &versionBugFix );
+ }
+ else {
+#endif
+ versionMajor = 10;
+ versionMinor = (version / 0x10) % 0x10;
+ versionBugFix = version % 0x10;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ }
+#endif
fl_mac_os_version = versionMajor * 10000 + versionMinor * 100 +
versionBugFix;
#endif
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
