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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtksalmenu.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e104d1ee6918d9143d5d91ac46bbe3da6c6df1c5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 10 20:20:32 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 11 09:42:57 2021 +0200

    gtk4: avoid gtk_widget_show_all
    
    Change-Id: Ib7151175e8f80def3d869330e1e6560e28e4c818
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115360
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 5f9b20effbbf..b35bb59c14aa 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1042,11 +1042,9 @@ void GtkSalMenu::CreateMenuBarWidget()
     g_signal_connect(G_OBJECT(mpMenuBarWidget), "key-press-event", G_CALLBACK(MenuBarSignalKey), this);
 #endif
 
-#if !GTK_CHECK_VERSION(4, 0, 0)
-    gtk_widget_show_all(mpMenuBarContainerWidget);
-#else
+    gtk_widget_show(mpMenuBarWidget);
+    gtk_widget_show(mpMenuAllowShrinkWidget);
     gtk_widget_show(mpMenuBarContainerWidget);
-#endif
 
     ShowCloseButton( static_cast<MenuBar*>(mpVCLMenu.get())->HasCloseButton() );