From 5839e3e8d5876792c75308d1c981da56af4fcac3 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 14 Dec 2020 23:40:29 +0100 Subject: [PATCH] app/internal/window: don't use C.BOOL Apparently, darwin/arm64 cgo doesn't match the types of YES and BOOL: os_macos.go:235:40: cannot use _Ciconst_YES (type untyped int) as type _Ctype__Bool Signed-off-by: Elias Naur --- app/internal/window/os_macos.go | 4 ++-- app/internal/window/os_macos.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/internal/window/os_macos.go b/app/internal/window/os_macos.go index f6be2cd6..8dd40aa8 100644 --- a/app/internal/window/os_macos.go +++ b/app/internal/window/os_macos.go @@ -230,9 +230,9 @@ func gio_onDraw(view C.CFTypeRef) { } //export gio_onFocus -func gio_onFocus(view C.CFTypeRef, focus C.BOOL) { +func gio_onFocus(view C.CFTypeRef, focus C.int) { w := mustView(view) - w.w.Event(key.FocusEvent{Focus: focus == C.YES}) + w.w.Event(key.FocusEvent{Focus: focus == 1}) w.SetCursor(w.cursor) } diff --git a/app/internal/window/os_macos.m b/app/internal/window/os_macos.m index 0796c9ab..2fefb14d 100644 --- a/app/internal/window/os_macos.m +++ b/app/internal/window/os_macos.m @@ -29,11 +29,11 @@ } - (void)windowDidBecomeKey:(NSNotification *)notification { NSWindow *window = (NSWindow *)[notification object]; - gio_onFocus((__bridge CFTypeRef)window.contentView, YES); + gio_onFocus((__bridge CFTypeRef)window.contentView, 1); } - (void)windowDidResignKey:(NSNotification *)notification { NSWindow *window = (NSWindow *)[notification object]; - gio_onFocus((__bridge CFTypeRef)window.contentView, NO); + gio_onFocus((__bridge CFTypeRef)window.contentView, 0); } - (void)windowWillClose:(NSNotification *)notification { NSWindow *window = (NSWindow *)[notification object];