From a703437796fefb44d4058cd36d6ba13abaab4725 Mon Sep 17 00:00:00 2001 From: Marcus Karlsson Date: Sun, 26 Oct 2014 12:26:48 +0100 Subject: quartz: fix build on 10.6 and below It is not possible to successfully build GTK+ on OS X 10.6 and below since NSFullScreenWindowMask is only available starting with 10.7. Add ifdef guards around setStyleMask: in order to allow it to build on earlier OS X releases. https://bugzilla.gnome.org/show_bug.cgi?id=737561 --- gdk/quartz/GdkQuartzNSWindow.c | 4 ++++ gdk/quartz/GdkQuartzNSWindow.h | 3 +++ 2 files changed, 7 insertions(+) (limited to 'gdk') diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c index 6bc05a4c4d..43348ef0f7 100644 --- a/gdk/quartz/GdkQuartzNSWindow.c +++ b/gdk/quartz/GdkQuartzNSWindow.c @@ -654,6 +654,8 @@ update_context_from_dragging_info (id sender) _gdk_quartz_drag_source_context = NULL; } +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + - (void)setStyleMask:(NSUInteger)styleMask { gboolean was_fullscreen; @@ -669,4 +671,6 @@ update_context_from_dragging_info (id sender) _gdk_quartz_window_update_fullscreen_state ([[self contentView] gdkWindow]); } +#endif + @end diff --git a/gdk/quartz/GdkQuartzNSWindow.h b/gdk/quartz/GdkQuartzNSWindow.h index 80b910cffc..540b965afb 100644 --- a/gdk/quartz/GdkQuartzNSWindow.h +++ b/gdk/quartz/GdkQuartzNSWindow.h @@ -42,7 +42,10 @@ -(BOOL)trackManualResize; -(void)showAndMakeKey:(BOOL)makeKey; -(void)hide; + +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER -(void)setStyleMask:(NSUInteger)styleMask; +#endif @end -- cgit v1.2.1