use container_focus_changed instead of toplevel_focus_changed

seeing as its the same thing, but available one level of
inheritance down

Change-Id: Ieedbf2bc8cea09cdafff1514eac5c35b85c2fdd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112023
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 0 insertions, 52 deletions

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index badc2ff188fd..02213a60f18e 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -470,10 +470,6 @@ public:
 
     virtual SystemEnvData get_system_data() const override;
 
-    virtual void connect_toplevel_focus_changed(const Link<weld::Widget&, void>& rLink) override;
-
-    virtual void HandleEventListener(VclWindowEvent& rEvent) override;
-
     virtual weld::ScreenShotCollection collect_screenshot_data() override;
 
     virtual VclPtr<VirtualDevice> screenshot() override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 81ceba3ccd11..18789ee73a77 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1435,23 +1435,6 @@ OString SalInstanceWindow::get_window_state(WindowStateMask nMask) const
 
 SystemEnvData SalInstanceWindow::get_system_data() const { return *m_xWindow->GetSystemData(); }
 
-void SalInstanceWindow::connect_toplevel_focus_changed(const Link<weld::Widget&, void>& rLink)
-{
-    ensure_event_listener();
-    weld::Window::connect_toplevel_focus_changed(rLink);
-}
-
-void SalInstanceWindow::HandleEventListener(VclWindowEvent& rEvent)
-{
-    if (rEvent.GetId() == VclEventId::WindowActivate
-        || rEvent.GetId() == VclEventId::WindowDeactivate)
-    {
-        signal_toplevel_focus_changed();
-        return;
-    }
-    SalInstanceContainer::HandleEventListener(rEvent);
-}
-
 VclPtr<VirtualDevice> SalInstanceWindow::screenshot()
 {
     SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(m_xWindow.get());
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7a58dd7d2ead..0a37e8175d86 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4040,7 +4040,6 @@ class GtkInstanceWindow : public GtkInstanceContainer, public virtual weld::Wind
 private:
     GtkWindow* m_pWindow;
     rtl::Reference<SalGtkXWindow> m_xWindow; //uno api
-    gulong m_nToplevelFocusChangedSignalId;
 
     static gboolean help_pressed(GtkAccelGroup*, GObject*, guint, GdkModifierType, gpointer widget)
     {
@@ -4049,12 +4048,6 @@ private:
         return true;
     }
 
-    static void signalToplevelFocusChanged(GtkWindow*, GParamSpec*, gpointer widget)
-    {
-        GtkInstanceWindow* pThis = static_cast<GtkInstanceWindow*>(widget);
-        pThis->signal_toplevel_focus_changed();
-    }
-
     bool isPositioningAllowed() const
     {
         bool bPositioningAllowed = true;
@@ -4072,7 +4065,6 @@ public:
     GtkInstanceWindow(GtkWindow* pWindow, GtkInstanceBuilder* pBuilder, bool bTakeOwnership)
         : GtkInstanceContainer(GTK_CONTAINER(pWindow), pBuilder, bTakeOwnership)
         , m_pWindow(pWindow)
-        , m_nToplevelFocusChangedSignalId(0)
     {
         const bool bIsFrameWeld = pBuilder == nullptr;
         if (!bIsFrameWeld)
@@ -4232,27 +4224,6 @@ public:
         return aData.ToStr();
     }
 
-    virtual void connect_toplevel_focus_changed(const Link<weld::Widget&, void>& rLink) override
-    {
-        assert(!m_nToplevelFocusChangedSignalId);
-        m_nToplevelFocusChangedSignalId = g_signal_connect(m_pWindow, "notify::has-toplevel-focus", G_CALLBACK(signalToplevelFocusChanged), this);
-        weld::Window::connect_toplevel_focus_changed(rLink);
-    }
-
-    virtual void disable_notify_events() override
-    {
-        if (m_nToplevelFocusChangedSignalId)
-            g_signal_handler_block(m_pWidget, m_nToplevelFocusChangedSignalId);
-        GtkInstanceContainer::disable_notify_events();
-    }
-
-    virtual void enable_notify_events() override
-    {
-        GtkInstanceContainer::enable_notify_events();
-        if (m_nToplevelFocusChangedSignalId)
-            g_signal_handler_unblock(m_pWidget, m_nToplevelFocusChangedSignalId);
-    }
-
     virtual VclPtr<VirtualDevice> screenshot() override
     {
         // detect if we have to manually setup its size
@@ -4306,8 +4277,6 @@ public:
 
     virtual ~GtkInstanceWindow() override
     {
-        if (m_nToplevelFocusChangedSignalId)
-            g_signal_handler_disconnect(m_pWindow, m_nToplevelFocusChangedSignalId);
         if (m_xWindow.is())
             m_xWindow->clear();
     }