include/vcl/weld.hxx | 4 ---- vcl/inc/qt5/QtInstanceWidget.hxx | 2 -- vcl/inc/salvtables.hxx | 2 -- vcl/qt5/QtInstanceWidget.cxx | 2 -- vcl/source/app/salvtables.cxx | 2 -- vcl/unx/gtk3/gtkinst.cxx | 6 ------ 6 files changed, 18 deletions(-)
New commits: commit 2be64257b9e9077e6dc13f7057bf6e3ecc8afb45 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 26 23:44:41 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 27 10:36:07 2025 +0100 weld: Drop newly unused weld::Widget::is_active This is now unused after Change-Id: I243621153fc8211e8a69aa9f048fc4ff620ab01a Author: Michael Weghorn <[email protected]> Date: Wed Nov 26 23:36:33 2025 +0100 vcl: Drop now unused CustomWidgetController::IsActive , so drop the method. This also addresses this old TODO comment: // return if this widget has the keyboard focus within the active window // TODO: review if this has any practical difference from has_focus() Change-Id: Ie0a82ee6ca631aabce444ad957a3331001e3a368 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194670 Code-Style: Michael Weghorn <[email protected]> Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 2741d7f31fd0..9398aa565aa5 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -165,10 +165,6 @@ public: // shown virtual bool has_child_focus() const = 0; - // return if this widget has the keyboard focus within the active window - // TODO: review if this has any practical difference from has_focus() - virtual bool is_active() const = 0; - /* size */ virtual void set_size_request(int nWidth, int nHeight) = 0; virtual Size get_size_request() const = 0; diff --git a/vcl/inc/qt5/QtInstanceWidget.hxx b/vcl/inc/qt5/QtInstanceWidget.hxx index ed208bb4b9fa..045b1c9855ab 100644 --- a/vcl/inc/qt5/QtInstanceWidget.hxx +++ b/vcl/inc/qt5/QtInstanceWidget.hxx @@ -50,8 +50,6 @@ public: virtual bool has_focus() const override; - virtual bool is_active() const override; - virtual bool has_child_focus() const override; virtual void show() override; diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 797a1ad154dc..d24bc1959f6f 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -240,8 +240,6 @@ public: virtual bool has_focus() const override; - virtual bool is_active() const override; - virtual bool has_child_focus() const override; virtual void show() override; diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx index ce2a8515b7a7..8531e279703a 100644 --- a/vcl/qt5/QtInstanceWidget.cxx +++ b/vcl/qt5/QtInstanceWidget.cxx @@ -134,8 +134,6 @@ bool QtInstanceWidget::has_focus() const return getQWidget()->hasFocus(); } -bool QtInstanceWidget::is_active() const { return has_focus(); } - bool QtInstanceWidget::has_child_focus() const { SolarMutexGuard g; diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 4e1239684b0e..18f5ee98283e 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -396,8 +396,6 @@ void SalInstanceWidget::grab_focus() bool SalInstanceWidget::has_focus() const { return m_xWidget->HasFocus(); } -bool SalInstanceWidget::is_active() const { return m_xWidget->IsActive(); } - bool SalInstanceWidget::has_child_focus() const { return m_xWidget->HasChildPathFocus(true); } void SalInstanceWidget::show() { m_xWidget->Show(); } diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index ffab77148148..56336207ae84 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -3470,12 +3470,6 @@ public: return gtk_widget_has_focus(m_pWidget); } - virtual bool is_active() const override - { - GtkWindow* pTopLevel = GTK_WINDOW(widget_get_toplevel(m_pWidget)); - return pTopLevel && gtk_window_is_active(pTopLevel) && has_focus(); - } - // is the focus in a child of this widget, where a transient popup attached // to a widget is considered a child of that widget virtual bool has_child_focus() const override
