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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 11 13:40:31 UTC 2021


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

New commits:
commit ebf494123720806a99e12001bdee9cae4a86c44f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 11 10:20:42 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 11 15:39:57 2021 +0200

    gtk: use explicit GtkBox instead of generic GtkContainer
    
    cause gtk4 doesn't have GtkContainer anymore
    
    Change-Id: I32893716654ba308277ee34ecd8c3c944a9bc575
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120314
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 238e2aa72571..9ad49d81d9e8 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10040,7 +10040,7 @@ class GtkInstanceMenuToggleButton : public GtkInstanceToggleButton, public MenuH
                                   , public virtual weld::MenuToggleButton
 {
 private:
-    GtkContainer* m_pContainer;
+    GtkBox* m_pContainer;
     GtkButton* m_pToggleMenuButton;
     gulong m_nMenuBtnClickedId;
     gulong m_nToggleStateFlagsChangedId;
@@ -10143,7 +10143,7 @@ public:
         : GtkInstanceToggleButton(GTK_TOGGLE_BUTTON(gtk_builder_get_object(pMenuToggleButtonBuilder, "togglebutton")),
                                   pBuilder, bTakeOwnership)
         , MenuHelper(gtk_menu_button_get_popup(pMenuButton), false)
-        , m_pContainer(GTK_CONTAINER(gtk_builder_get_object(pMenuToggleButtonBuilder, "box")))
+        , m_pContainer(GTK_BOX(gtk_builder_get_object(pMenuToggleButtonBuilder, "box")))
         , m_pToggleMenuButton(GTK_BUTTON(gtk_builder_get_object(pMenuToggleButtonBuilder, "menubutton")))
         , m_nMenuBtnClickedId(g_signal_connect(m_pToggleMenuButton, "clicked", G_CALLBACK(signalMenuBtnClicked), this))
         , m_nToggleStateFlagsChangedId(g_signal_connect(m_pToggleButton, "state-flags-changed", G_CALLBACK(signalToggleStateFlagsChanged), this))


More information about the Libreoffice-commits mailing list