From 709f12b9ac827f64e1c61729e99d0c87157c7044 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 29 Nov 2012 14:51:59 +0100 Subject: [PATCH] quartz: add mountain lion as version 8 to enum GdkOSXVersion Also use GDK_OSX_UNSUPPORTED instead of 0 in gdk_quartz_osx_version(). (cherry picked from commit 9644e910a85f97aedf3f5f4fee974229f29766c3) --- gdk/quartz/gdkglobals-quartz.c | 4 ++-- gdk/quartz/gdkquartz.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gdk/quartz/gdkglobals-quartz.c b/gdk/quartz/gdkglobals-quartz.c index c6a7a227bb..efcf73c391 100644 --- a/gdk/quartz/gdkglobals-quartz.c +++ b/gdk/quartz/gdkglobals-quartz.c @@ -28,9 +28,9 @@ GdkWindow *_gdk_root = NULL; GdkOSXVersion gdk_quartz_osx_version (void) { - static gint32 minor = 0; + static gint32 minor = GDK_OSX_UNSUPPORTED; - if (!minor) + if (minor == GDK_OSX_UNSUPPORTED) { OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&minor); diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h index 3697c00d30..9427d1dc85 100644 --- a/gdk/quartz/gdkquartz.h +++ b/gdk/quartz/gdkquartz.h @@ -48,7 +48,8 @@ typedef enum GDK_OSX_LEOPARD = 5, GDK_OSX_SNOW_LEOPARD = 6, GDK_OSX_LION = 7, - GDK_OSX_CURRENT = 7, + GDK_OSX_MOUNTAIN_LION = 8, + GDK_OSX_CURRENT = 8, GDK_OSX_NEW = 99 } GdkOSXVersion;