diff --git a/native/Avalonia.Native/inc/avalonia-native.h b/native/Avalonia.Native/inc/avalonia-native.h index d8d65c2fe6..757c0bc85a 100644 --- a/native/Avalonia.Native/inc/avalonia-native.h +++ b/native/Avalonia.Native/inc/avalonia-native.h @@ -189,7 +189,6 @@ public: virtual HRESULT CreateClipboard(IAvnClipboard** ppv) = 0; virtual HRESULT CreateCursorFactory(IAvnCursorFactory** ppv) = 0; virtual HRESULT ObtainGlDisplay(IAvnGlDisplay** ppv) = 0; - virtual HRESULT ObtainAppMenu(IAvnMenu** retOut) = 0; virtual HRESULT SetAppMenu(IAvnMenu* menu) = 0; virtual HRESULT CreateMenu (IAvnMenuEvents* cb, IAvnMenu** ppv) = 0; virtual HRESULT CreateMenuItem (IAvnMenuItem** ppv) = 0; @@ -224,7 +223,6 @@ AVNCOM(IAvnWindowBase, 02) : IUnknown virtual HRESULT SetCursor(IAvnCursor* cursor) = 0; virtual HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget** ret) = 0; virtual HRESULT SetMainMenu(IAvnMenu* menu) = 0; - virtual HRESULT ObtainMainMenu(IAvnMenu** retOut) = 0; virtual HRESULT ObtainNSWindowHandle(void** retOut) = 0; virtual HRESULT ObtainNSWindowHandleRetained(void** retOut) = 0; virtual HRESULT ObtainNSViewHandle(void** retOut) = 0; diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm index 54ba93c06a..a63353bc0a 100644 --- a/native/Avalonia.Native/src/OSX/main.mm +++ b/native/Avalonia.Native/src/OSX/main.mm @@ -250,18 +250,6 @@ public: ::SetAppMenu(s_appTitle, appMenu); return S_OK; } - - virtual HRESULT ObtainAppMenu(IAvnMenu** retOut) override - { - if(retOut == nullptr) - { - return E_POINTER; - } - - *retOut = ::GetAppMenu(); - - return S_OK; - } }; extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative() diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm index ce66a6c327..1bb4fc62b0 100644 --- a/native/Avalonia.Native/src/OSX/window.mm +++ b/native/Avalonia.Native/src/OSX/window.mm @@ -247,18 +247,6 @@ public: return S_OK; } - virtual HRESULT ObtainMainMenu(IAvnMenu** ret) override - { - if(ret == nullptr) - { - return E_POINTER; - } - - *ret = _mainMenu; - - return S_OK; - } - virtual HRESULT BeginMoveDrag () override { @autoreleasepool diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs index a9438d33b7..077fd624c1 100644 --- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs +++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs @@ -131,16 +131,11 @@ namespace Avalonia.Native if (_nativeMenu is null) { - _nativeMenu = _factory.ObtainAppMenu(); + _nativeMenu = IAvnMenu.Create(_factory); - if (_nativeMenu is null) - { - _nativeMenu = IAvnMenu.Create(_factory); - - _nativeMenu.Initialise(this, appMenuHolder, ""); + _nativeMenu.Initialise(this, appMenuHolder, ""); - setMenu = true; - } + setMenu = true; } _nativeMenu.Update(_factory, appMenuHolder); @@ -155,14 +150,9 @@ namespace Avalonia.Native { if (_nativeMenu is null) { - _nativeMenu = avnWindow.ObtainMainMenu(); + _nativeMenu = IAvnMenu.Create(_factory); - if (_nativeMenu is null) - { - _nativeMenu = IAvnMenu.Create(_factory); - - _nativeMenu.Initialise(this, menu, ""); - } + _nativeMenu.Initialise(this, menu, ""); } _nativeMenu.Update(_factory, menu);