From d27a41606bc1d860b1d7b07d9f3e004a52947ac6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 Aug 2020 10:45:08 +0100 Subject: Related: tdf#135965 return true to show event was handled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I87ee0f990bf2c908a28bd212bdef870d245a9282 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101313 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/unx/gtk3/gtk3gtkinst.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'vcl/unx/gtk3/gtk3gtkinst.cxx') diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 85762c4893f1..480aa2ee70a6 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -3902,10 +3902,11 @@ private: rtl::Reference m_xWindow; //uno api gulong m_nToplevelFocusChangedSignalId; - static void help_pressed(GtkAccelGroup*, GObject*, guint, GdkModifierType, gpointer widget) + static gboolean help_pressed(GtkAccelGroup*, GObject*, guint, GdkModifierType, gpointer widget) { GtkInstanceWindow* pThis = static_cast(widget); pThis->help(); + return true; } static void signalToplevelFocusChanged(GtkWindow*, GParamSpec*, gpointer widget) @@ -16336,11 +16337,11 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& // tdf#135965 for the case of native widgets inside a GtkSalFrame and F1 pressed, run help // on gtk widget help ids until we hit a vcl parent and then use vcl window help ids -void GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, GdkModifierType, gpointer pFrame) +gboolean GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, GdkModifierType, gpointer pFrame) { Help* pHelp = Application::GetHelp(); if (!pHelp) - return; + return true; GtkWindow* pWindow = static_cast(pFrame); @@ -16375,15 +16376,16 @@ void GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, GdkMo sHelpId = pChildWindow->GetHelpId(); } if (!pChildWindow) - return; + return true; pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), pChildWindow); - return; + return true; } if (!pWidget) - return; + return true; std::unique_ptr xTemp(new GtkInstanceWidget(pWidget, nullptr, false)); pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), xTemp.get()); + return true; } weld::Builder* GtkInstance::CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile, sal_uInt64) -- cgit v1.2.3