From 7abf811bcbb92562a8da965d2ff03b9d53853e09 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 1 Oct 2021 12:42:26 +0100 Subject: tdf#144846 launch gtk3 menubar menus from LibreOffice code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rather than using the builtin gtk mechanism so we can avoid duplicate mnemonics in the sidebar getting used instead. Change-Id: I6c761ae63ae25d835de9444b0e298c63996a83a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122926 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/inc/unx/gtk/gtkframe.hxx | 2 ++ vcl/inc/unx/gtk/gtksalmenu.hxx | 1 + 2 files changed, 3 insertions(+) (limited to 'vcl/inc') diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index b71d40785200..ced3613ad0ca 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -410,6 +410,8 @@ class GtkSalFrame final : public SalFrame void SetIcon(const char* pIcon); + bool HandleMenubarMnemonic(guint eState, guint nKeyval); + public: cairo_surface_t* m_pSurface; basegfx::B2IVector m_aFrameSize; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 36b695a2ccc9..8b68391b1fc9 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -121,6 +121,7 @@ public: GtkSalMenu* GetTopLevel(); void SetNeedsUpdate(); + GtkWidget* GetMenuBarWidget() const { return mpMenuBarWidget; } GtkWidget* GetMenuBarContainerWidget() const { return mpMenuBarContainerWidget; } void CreateMenuBarWidget(); -- cgit