use GetPopupParent for editeng transient dialogs

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

3 files changed, 27 insertions, 26 deletions

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 11aab8917f7e..b8c5888572d0 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -337,6 +337,8 @@ public:
 
     virtual void thaw() override;
 
+    virtual void set_busy_cursor(bool bBusy) override;
+
     virtual std::unique_ptr<weld::Container> weld_parent() const override;
 
     virtual ~SalInstanceWidget() override;
@@ -434,8 +436,6 @@ public:
 
     void help();
 
-    virtual void set_busy_cursor(bool bBusy) override;
-
     virtual css::uno::Reference<css::awt::XWindow> GetXWindow() override;
 
     virtual void resize_to_request() override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 21c3e206fa88..378a43f54896 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -485,6 +485,14 @@ void SalInstanceWidget::freeze() { m_xWidget->SetUpdateMode(false); }
 
 void SalInstanceWidget::thaw() { m_xWidget->SetUpdateMode(true); }
 
+void SalInstanceWidget::set_busy_cursor(bool bBusy)
+{
+    if (bBusy)
+        m_xWidget->EnterWait();
+    else
+        m_xWidget->LeaveWait();
+}
+
 SalInstanceWidget::~SalInstanceWidget()
 {
     if (m_aMnemonicActivateHdl.IsSet())
@@ -1336,14 +1344,6 @@ void SalInstanceWindow::set_title(const OUString& rTitle) { m_xWindow->SetText(r
 
 OUString SalInstanceWindow::get_title() const { return m_xWindow->GetText(); }
 
-void SalInstanceWindow::set_busy_cursor(bool bBusy)
-{
-    if (bBusy)
-        m_xWindow->EnterWait();
-    else
-        m_xWindow->LeaveWait();
-}
-
 css::uno::Reference<css::awt::XWindow> SalInstanceWindow::GetXWindow()
 {
     css::uno::Reference<css::awt::XWindow> xWindow(m_xWindow->GetComponentInterface(),
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8f0754d4325e..edffff102d48 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1922,6 +1922,18 @@ void LocalizeDecimalSeparator(GdkEventKey* pEvent)
     }
 }
 
+void set_cursor(GtkWidget* pWidget, const char *pName)
+{
+    if (!gtk_widget_get_realized(pWidget))
+        gtk_widget_realize(pWidget);
+    GdkDisplay *pDisplay = gtk_widget_get_display(pWidget);
+    GdkCursor *pCursor = pName ? gdk_cursor_new_from_name(pDisplay, pName) : nullptr;
+    gdk_window_set_cursor(gtk_widget_get_window(pWidget), pCursor);
+    gdk_display_flush(pDisplay);
+    if (pCursor)
+        g_object_unref(pCursor);
+}
+
 class GtkInstanceWidget : public virtual weld::Widget
 {
 protected:
@@ -2994,6 +3006,11 @@ public:
         gtk_widget_thaw_child_notify(m_pWidget);
     }
 
+    virtual void set_busy_cursor(bool bBusy) override
+    {
+        set_cursor(m_pWidget, bBusy ? "progress" : nullptr);
+    }
+
     virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> get_drop_target() override
     {
         if (!m_xDropTarget)
@@ -3925,17 +3942,6 @@ public:
     }
 };
 
-    void set_cursor(GtkWidget* pWidget, const char *pName)
-    {
-        if (!gtk_widget_get_realized(pWidget))
-            gtk_widget_realize(pWidget);
-        GdkDisplay *pDisplay = gtk_widget_get_display(pWidget);
-        GdkCursor *pCursor = pName ? gdk_cursor_new_from_name(pDisplay, pName) : nullptr;
-        gdk_window_set_cursor(gtk_widget_get_window(pWidget), pCursor);
-        gdk_display_flush(pDisplay);
-        if (pCursor)
-            g_object_unref(pCursor);
-    }
 }
 
 namespace
@@ -4064,11 +4070,6 @@ public:
         return css::uno::Reference<css::awt::XWindow>(m_xWindow.get());
     }
 
-    virtual void set_busy_cursor(bool bBusy) override
-    {
-        set_cursor(m_pWidget, bBusy ? "progress" : nullptr);
-    }
-
     virtual void set_modal(bool bModal) override
     {
         gtk_window_set_modal(m_pWindow, bModal);