From e0a5aaf3138a03a199ee2672603bbc0be37bddd6 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 21 Apr 2020 11:54:34 -0300
Subject: [PATCH] allow creating menu with events.

---
 native/Avalonia.Native/src/OSX/common.h | 2 +-
 native/Avalonia.Native/src/OSX/main.mm  | 2 +-
 native/Avalonia.Native/src/OSX/menu.h   | 3 ++-
 native/Avalonia.Native/src/OSX/menu.mm  | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index 591f0a2e46..7a433bfd9f 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -15,7 +15,7 @@ extern IAvnScreens* CreateScreens();
 extern IAvnClipboard* CreateClipboard();
 extern IAvnCursorFactory* CreateCursorFactory();
 extern IAvnGlDisplay* GetGlDisplay();
-extern IAvnMenu* CreateAppMenu();
+extern IAvnMenu* CreateAppMenu(IAvnMenuEvents* events);
 extern IAvnMenuItem* CreateAppMenuItem();
 extern IAvnMenuItem* CreateAppMenuItemSeperator();
 extern void SetAppMenu (NSString* appName, IAvnMenu* appMenu);
diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index 08d71c286d..54ba93c06a 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -229,7 +229,7 @@ public:
     
     virtual HRESULT CreateMenu (IAvnMenuEvents* cb, IAvnMenu** ppv) override
     {
-        *ppv = ::CreateAppMenu();
+        *ppv = ::CreateAppMenu(cb);
         return S_OK;
     }
     
diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h
index 82e60addcb..e76605d362 100644
--- a/native/Avalonia.Native/src/OSX/menu.h
+++ b/native/Avalonia.Native/src/OSX/menu.h
@@ -58,11 +58,12 @@ class AvnAppMenu : public ComSingleObject<IAvnMenu, &IID_IAvnMenu>
 {
 private:
     AvnMenu* _native;
+    ComPtr<IAvnMenuEvents> _baseEvents;
     
 public:
     FORWARD_IUNKNOWN()
     
-    AvnAppMenu();
+    AvnAppMenu(IAvnMenuEvents* events);
         
     AvnMenu* GetNative();
     
diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 6d1ba24f5f..9a133b6c0c 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -154,8 +154,9 @@ void AvnAppMenuItem::RaiseOnClicked()
     }
 }
 
-AvnAppMenu::AvnAppMenu()
+AvnAppMenu::AvnAppMenu(IAvnMenuEvents* events)
 {
+    _baseEvents = events;
     id del = [[AvnMenuDelegate alloc] initWithParent: this];
     _native = [[AvnMenu alloc] initWithDelegate: del];
 }
@@ -240,7 +241,7 @@ extern IAvnMenu* CreateAppMenu(IAvnMenuEvents* cb)
 {
     @autoreleasepool
     {
-        return new AvnAppMenu();
+        return new AvnAppMenu(cb);
     }
 }