diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-16 12:02:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-16 14:45:07 +0200 |
| commit | 8087113baf9dfa346f4f8280463ca8bc16106f2e (patch) | |
| tree | 4d21fa0b61f874ef1bee80b02ee1956688a16233 /vcl | |
| parent | d60489cca78c91d24cf0ac7fd82e1bcccdc8d1da (diff) | |
gtk4: adjust to GtkMenuButton changes in 4.6 onwards
Change-Id: I892aae979f8fb9b5a7c13a790905d7e7e3f2c087
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122190
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index c3bdb8a197f5..b2f544e4dea8 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -10223,7 +10223,15 @@ public: } g_list_free(pChildren); #else - GtkWidget* pChild = gtk_widget_get_last_child(GTK_WIDGET(m_pMenuButton)); + GtkWidget* pChild; + if (gtk_check_version(4, 5, 0) == nullptr) + { + pChild = gtk_widget_get_first_child(GTK_WIDGET(m_pMenuButton)); + pChild = gtk_widget_get_first_child(pChild); + pChild = gtk_widget_get_first_child(pChild); + } + else + pChild = gtk_widget_get_last_child(GTK_WIDGET(m_pMenuButton)); g_object_ref(pChild); gtk_widget_unparent(pChild); gtk_button_set_child(GTK_BUTTON(m_pToggleButton), pChild); |