include/vcl/weld.hxx | 4 +--- vcl/unx/gtk3/gtkinst.cxx | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-)
New commits: commit e9396f82412863e69ac9852ec1f48bf83787f10b Author: Michael Weghorn <[email protected]> AuthorDate: Sat Oct 18 02:50:43 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Oct 20 17:05:24 2025 +0200 weld: Use #pragma once Change-Id: I158791c0b4a8396feb08a8b46dddbeefe39e73d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192596 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 2055dab56df7..4a5bc6a32484 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_WELD_HXX -#define INCLUDED_VCL_WELD_HXX +#pragma once #include <basegfx/range/b2irange.hxx> #include <rtl/ustring.hxx> @@ -2947,6 +2946,5 @@ void Dialog::set_default_response(int nResponse) change_default_button(nullptr, pButton.get()); } } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit a22aa2e7c4d4ee85ee33dee909e97f19db2995b9 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Oct 17 21:09:03 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Oct 20 17:05:14 2025 +0200 gtk: Drop GtkInstanceIconView::handle_item_activated It effectively just calls weld::IconView::signal_item_activated, so switch the only caller to call that one directly. Change-Id: I65ef095f54e54c7e731465e17ea1948f5f79466f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192595 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index a3a7abba3760..8de594dc7f6a 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -16807,17 +16807,11 @@ private: pThis->launch_signal_selection_changed(); } - void handle_item_activated() - { - if (signal_item_activated()) - return; - } - static void signalItemActivated(GtkIconView*, GtkTreePath*, gpointer widget) { GtkInstanceIconView* pThis = static_cast<GtkInstanceIconView*>(widget); SolarMutexGuard aGuard; - pThis->handle_item_activated(); + pThis->signal_item_activated(); } static gboolean signalQueryTooltip(GtkWidget* /*pGtkWidget*/, gint x, gint y,
