[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx          |    3 ++-
 vcl/inc/salvtables.hxx        |    4 ++--
 vcl/source/app/salvtables.cxx |    4 ++--
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 6d7a7845ae9f774daf8da6ac528d970d29fa2b1d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Mar 7 16:08:43 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Mar 7 20:26:07 2021 +0100

    move queue_resize to baseclass
    
    Change-Id: I7f34037fc2c48168a56918c83ac7323febfe7486
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112139
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index a5590b73f6ae..0b995277cd31 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -289,6 +289,8 @@ public:
 
     virtual void set_busy_cursor(bool bBusy) = 0;
 
+    virtual void queue_resize() = 0;
+
     virtual std::unique_ptr<Container> weld_parent() const = 0;
 
     //iterate upwards through the hierarchy starting at this widgets parent,
@@ -2181,7 +2183,6 @@ public:
     }
     virtual void queue_draw() = 0;
     virtual void queue_draw_area(int x, int y, int width, int height) = 0;
-    virtual void queue_resize() = 0;
 
     virtual void enable_drag_source(rtl::Reference<TransferDataContainer>& rTransferrable,
                                     sal_uInt8 eDNDConstants)
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 02213a60f18e..1a0563307e0d 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -353,6 +353,8 @@ public:
 
     void enable_notify_events();
 
+    virtual void queue_resize() override;
+
     virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) override;
 
     virtual OUString strip_mnemonic(const OUString& rLabel) const override;
@@ -1138,8 +1140,6 @@ public:
 
     virtual void queue_draw_area(int x, int y, int width, int height) override;
 
-    virtual void queue_resize() override;
-
     virtual void connect_size_allocate(const Link<const Size&, void>& rLink) override;
 
     virtual void connect_key_press(const Link<const KeyEvent&, bool>& rLink) override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 18789ee73a77..781381aff7b2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -493,6 +493,8 @@ void SalInstanceWidget::set_busy_cursor(bool bBusy)
         m_xWidget->LeaveWait();
 }
 
+void SalInstanceWidget::queue_resize() { m_xWidget->queue_resize(); }
+
 SalInstanceWidget::~SalInstanceWidget()
 {
     if (m_aMnemonicActivateHdl.IsSet())
@@ -5897,8 +5899,6 @@ void SalInstanceDrawingArea::queue_draw_area(int x, int y, int width, int height
     m_xDrawingArea->Invalidate(tools::Rectangle(Point(x, y), Size(width, height)));
 }
 
-void SalInstanceDrawingArea::queue_resize() { m_xDrawingArea->queue_resize(); }
-
 void SalInstanceDrawingArea::connect_size_allocate(const Link<const Size&, void>& rLink)
 {
     weld::Widget::connect_size_allocate(rLink);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 0a37e8175d86..f1e99eccca07 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3021,6 +3021,11 @@ public:
         set_cursor(m_pWidget, bBusy ? "progress" : nullptr);
     }
 
+    virtual void queue_resize() override
+    {
+        gtk_widget_queue_resize(m_pWidget);
+    }
+
     virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> get_drop_target() override
     {
         if (!m_xDropTarget)
@@ -13933,11 +13938,6 @@ public:
         gtk_widget_queue_draw_area(GTK_WIDGET(m_pDrawingArea), aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight());
     }
 
-    virtual void queue_resize() override
-    {
-        gtk_widget_queue_resize(GTK_WIDGET(m_pDrawingArea));
-    }
-
     virtual a11yref get_accessible_parent() override
     {
         //get_accessible_parent should only be needed for the vcl implementation,