summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-10-01 12:42:26 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-10-01 22:51:24 +0200
commit7abf811bcbb92562a8da965d2ff03b9d53853e09 (patch)
tree69f07d93b8238a5e8a6fd98fd7b58f6b1d7adc51 /vcl/inc
parent0068583984c4ff7b33857cd5f351eb8a63e6a3e7 (diff)
tdf#144846 launch gtk3 menubar menus from LibreOffice code
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 <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx1
2 files changed, 3 insertions, 0 deletions
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();