diff options
| author | Michael Natterer <mitch@gimp.org> | 2012-11-29 14:51:59 +0100 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2012-11-29 15:02:27 +0100 |
| commit | 200aab2f7fcea03614a7bed699112dce7b3bfc40 (patch) | |
| tree | 0edf510483e426fb3fbfe8fc2aad420c305993ff | |
| parent | cfe1b0263ffb3b72ead2b05491b9fdd1e0b1b997 (diff) | |
| download | gtk+-200aab2f7fcea03614a7bed699112dce7b3bfc40.tar.gz | |
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)
| -rw-r--r-- | gdk/quartz/gdkglobals-quartz.c | 4 | ||||
| -rw-r--r-- | 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; |