diff options
| author | iain <iaholmes@microsoft.com> | 2019-07-11 18:28:31 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-11 18:28:31 +0300 |
| commit | ebd7067a495424591809db3d140dc92fb0466d6c (patch) | |
| tree | 83644b6acf7ca82a62a46da7c40afa2b0151ba8c | |
| parent | b83885fb5b0783348fa787e7e9dea08b343b0e97 (diff) | |
[Gtk] Fix previous patch build (#109)
| -rw-r--r-- | packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch b/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch index 666036e..2cefd1b 100644 --- a/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch +++ b/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch @@ -1,26 +1,22 @@ diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c -index e8e0de5c7..63f3402f8 100644 +index e8e0de5c7..d0c6e84ec 100644 --- a/gdk/quartz/GdkQuartzWindow.c +++ b/gdk/quartz/GdkQuartzWindow.c -@@ -22,7 +22,16 @@ - #include "gdkwindow-quartz.h" - #include "gdkprivate-quartz.h" +@@ -24,6 +24,13 @@ + + @implementation GdkQuartzWindow --@implementation GdkQuartzWindow -+@implementation GdkQuartzWindow { -+ BOOL _allowDelegateToBeSetToNil; -+} -+ +-(void)dealloc +{ + // During deallocation, Cocoa resets the delegate to nil + // We need to track that so that we don't throw an error + _allowDelegateToBeSetToNil = YES; +} - ++ -(BOOL)windowShouldClose:(id)sender { -@@ -259,6 +268,16 @@ + GdkWindow *window = [[self contentView] gdkWindow]; +@@ -259,6 +266,16 @@ return [super makeFirstResponder:responder]; } @@ -37,7 +33,7 @@ index e8e0de5c7..63f3402f8 100644 -(id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag screen:(NSScreen *)screen { self = [super initWithContentRect:contentRect -@@ -271,6 +290,7 @@ +@@ -271,6 +288,7 @@ [self setDelegate:self]; [self setReleasedWhenClosed:YES]; @@ -45,3 +41,16 @@ index e8e0de5c7..63f3402f8 100644 return self; } +diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzWindow.h +index 928f9617e..23cde0037 100644 +--- a/gdk/quartz/GdkQuartzWindow.h ++++ b/gdk/quartz/GdkQuartzWindow.h +@@ -34,6 +34,8 @@ + NSPoint initialMoveLocation; + NSPoint initialResizeLocation; + NSRect initialResizeFrame; ++ ++ BOOL _allowDelegateToBeSetToNil; + } + + -(BOOL)isInMove; |