[gtk/gtk-3-24] [Quartz]Silence type mismatch warning.



commit c6036592c9c052237cf9ea3ae5684177017cdf83
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jun 20 10:20:20 2020 -0700

    [Quartz]Silence type mismatch warning.

 gtk/gtkapplication-quartz.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkapplication-quartz.c b/gtk/gtkapplication-quartz.c
index fec5025496..f614dea296 100644
--- a/gtk/gtkapplication-quartz.c
+++ b/gtk/gtkapplication-quartz.c
@@ -56,8 +56,11 @@ typedef struct
 } GtkApplicationImplQuartz;
 
 G_DEFINE_TYPE (GtkApplicationImplQuartz, gtk_application_impl_quartz, GTK_TYPE_APPLICATION_IMPL)
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+@interface GtkApplicationQuartzDelegate : NSObject <NSApplicationDelegate>
+#else
 @interface GtkApplicationQuartzDelegate : NSObject
+#endif
 {
   GtkApplicationImplQuartz *quartz;
 }
@@ -162,7 +165,7 @@ gtk_application_impl_quartz_startup (GtkApplicationImpl *impl,
   if (register_session)
     {
       quartz->delegate = [[GtkApplicationQuartzDelegate alloc] initWithImpl:quartz];
-      [NSApp setDelegate: quartz->delegate];
+      [NSApp setDelegate: (id)(quartz->delegate)];
     }
 
   quartz->muxer = gtk_action_muxer_new ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]