callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quartz: call Gestalt() only once per session in gdk_quartz_osx_version()

Browse Source 
Thanks to Paul Davis for pointing this out.
(cherry picked from commit d6533ffc44d77b42cce7987f249fa481581b7c50)
This commit is contained in:
Michael Natterer
2012-11-29 14:44:04 +01:00
parent fd301e7847
commit e2144fbb7e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/quartz/gdkglobals-quartz.c
View File

@ -28,9 +28,14 @@ GdkWindow *_gdk_root = NULL;
GdkOSXVersion GdkOSXVersion
gdk_quartz_osx_version (void) gdk_quartz_osx_version (void)
{ {
gint minor; static gint32 minor = 0;
OSErr err = Gestalt (gestaltSystemVersionMinor, &minor);
if (!minor)
{
OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&minor);
g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED); g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED);
}
if (minor < GDK_OSX_MIN) if (minor < GDK_OSX_MIN)
return GDK_OSX_UNSUPPORTED; return GDK_OSX_UNSUPPORTED;