From ad645d40374f72bc14add43b4e841c6b6e847b1c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 13 Apr 2020 12:52:29 -0300 Subject: [PATCH] attempt to add NSMenuDelegate --- native/Avalonia.Native/src/OSX/menu.h | 3 +-- native/Avalonia.Native/src/OSX/menu.mm | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h index cbfd94d8b6..3c68cc222b 100644 --- a/native/Avalonia.Native/src/OSX/menu.h +++ b/native/Avalonia.Native/src/OSX/menu.h @@ -14,8 +14,7 @@ class AvnAppMenuItem; class AvnAppMenu; -@interface AvnMenu : NSMenu // for some reason it doesnt detect nsmenu here but compiler doesnt complain -- (void)setMenu:(NSMenu*) menu; +@interface AvnMenu : NSMenu @end @interface AvnMenuItem : NSMenuItem diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm index 2e94de7207..55a6f385d8 100644 --- a/native/Avalonia.Native/src/OSX/menu.mm +++ b/native/Avalonia.Native/src/OSX/menu.mm @@ -4,6 +4,20 @@ #include "window.h" @implementation AvnMenu +- (void)menuNeedsUpdate:(NSMenu *)menu +{ + printf("TEST"); +} + +- (void)menuWillOpen:(NSMenu *)menu +{ + +} + +- (void)menuDidClose:(NSMenu *)menu +{ + +} @end @implementation AvnMenuItem @@ -146,11 +160,13 @@ void AvnAppMenuItem::RaiseOnClicked() AvnAppMenu::AvnAppMenu() { _native = [AvnMenu new]; + [_native setDelegate:_native]; } AvnAppMenu::AvnAppMenu(AvnMenu* native) { _native = native; + [_native setDelegate:_native]; } AvnMenu* AvnAppMenu::GetNative()