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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 17 12:01:05 UTC 2021


 vcl/unx/gtk3/gtkinst.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit f252223140b040a1ad76f87fce27448bd24848b8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 17 09:35:01 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 17 14:00:17 2021 +0200

    gtk4: undo overflow notebook insert in dtor
    
    Change-Id: I2a051486346d4afabbf7f0f6f3b9683c8e0c9e62
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117367
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b1c8a2fbe0b5..830cb067ddd7 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -8658,14 +8658,12 @@ public:
 #endif
         if (m_pOverFlowBox)
         {
-#if !GTK_CHECK_VERSION(4, 0, 0)
             // put it back to how we found it initially
             GtkWidget* pParent = gtk_widget_get_parent(GTK_WIDGET(m_pOverFlowBox));
             g_object_ref(m_pNotebook);
             container_remove(GTK_WIDGET(m_pOverFlowBox), GTK_WIDGET(m_pNotebook));
             container_add(GTK_WIDGET(pParent), GTK_WIDGET(m_pNotebook));
             g_object_unref(m_pNotebook);
-#endif
 
 #if !GTK_CHECK_VERSION(4, 0, 0)
             gtk_widget_destroy(GTK_WIDGET(m_pOverFlowBox));


More information about the Libreoffice-commits mailing list