diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-10 17:40:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-10 20:32:18 +0200 |
| commit | 522983d79aa03bd5cc83a8a8b5b385f3b6cfe998 (patch) | |
| tree | 213fc6805534e40b0ede256e07fe5e2c61761e5e /vcl/unx | |
| parent | 44583c313aad7076d67f868379e9b6616485b299 (diff) | |
gtk[3|4] use set_buildable_id and get_buildable_id
Change-Id: Ia3a24d80ac56bc834c11f85a98e3b9fa1a862e41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123343
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtksalmenu.cxx | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index ec87c2785741..c648bfee534d 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -2495,6 +2495,8 @@ void set_cursor(GtkWidget* pWidget, const char *pName) #endif } +} + OString get_buildable_id(GtkBuildable* pWidget) { #if GTK_CHECK_VERSION(4, 0, 0) @@ -2515,6 +2517,8 @@ void set_buildable_id(GtkBuildable* pWidget, const OString& rId) #endif } +namespace { + class GtkInstanceWidget : public virtual weld::Widget { protected: diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx index 1ef9dfc88137..a202f75760e3 100644 --- a/vcl/unx/gtk3/gtksalmenu.cxx +++ b/vcl/unx/gtk3/gtksalmenu.cxx @@ -787,12 +787,7 @@ namespace static void MenuButtonClicked(GtkWidget* pWidget, gpointer pMenu) { -#if !GTK_CHECK_VERSION(4, 0, 0) - const gchar* pStr = gtk_buildable_get_name(GTK_BUILDABLE(pWidget)); -#else - const char* pStr = gtk_buildable_get_buildable_id(GTK_BUILDABLE(pWidget)); -#endif - OString aId(pStr, pStr ? strlen(pStr) : 0); + OString aId(get_buildable_id(GTK_BUILDABLE(pWidget))); static_cast<MenuBar*>(pMenu)->HandleMenuButtonEvent(aId.toUInt32()); } @@ -829,9 +824,7 @@ bool GtkSalMenu::AddMenuBarButton(const SalMenuButtonItem& rNewItem) maExtraButtons.emplace_back(rNewItem.mnId, pButton); -#if !GTK_CHECK_VERSION(4, 0, 0) - gtk_buildable_set_name(GTK_BUILDABLE(pButton), OString::number(rNewItem.mnId).getStr()); -#endif + set_buildable_id(GTK_BUILDABLE(pButton), OString::number(rNewItem.mnId).getStr()); gtk_widget_set_tooltip_text(pButton, rNewItem.maToolTipText.toUtf8().getStr()); |