From c7e685513fb154bd5c42c62ad3506cf0413ab5ca Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Mon, 11 Mar 2024 23:53:41 +0300 Subject: [PATCH] Fix some GTK deprecation warnings --- src/image.cc | 6 +++--- src/ui-menu.cc | 4 ++++ src/ui-misc.cc | 13 ++++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/image.cc b/src/image.cc index 45af04d0..2e81edb5 100644 --- a/src/image.cc +++ b/src/image.cc @@ -2018,11 +2018,11 @@ void image_select(ImageWindow *imd, gboolean select) if (select) { - gtk_widget_set_state(imd->widget, GTK_STATE_SELECTED); - gtk_widget_set_state(imd->pr, GTK_STATE_NORMAL); /* do not propagate */ + gtk_widget_set_state_flags(imd->widget, GTK_STATE_FLAG_SELECTED, TRUE); + gtk_widget_set_state_flags(imd->pr, GTK_STATE_FLAG_NORMAL, TRUE); /* do not propagate */ } else - gtk_widget_set_state(imd->widget, GTK_STATE_NORMAL); + gtk_widget_set_state_flags(imd->widget, GTK_STATE_FLAG_NORMAL, TRUE); } void image_set_selectable(ImageWindow *imd, gboolean selectable) diff --git a/src/ui-menu.cc b/src/ui-menu.cc index 7ec7e997..913fa8f8 100644 --- a/src/ui-menu.cc +++ b/src/ui-menu.cc @@ -429,6 +429,9 @@ GtkWidget *popup_menu_short_lived() return menu; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +// @todo Used only in vd_menu_position_cb_unused(). Remove? gboolean popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height) { gboolean adjusted = FALSE; @@ -475,4 +478,5 @@ gboolean popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height) return adjusted; } +#pragma GCC diagnostic pop /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/ui-misc.cc b/src/ui-misc.cc index 81973ff8..47aff9ed 100644 --- a/src/ui-misc.cc +++ b/src/ui-misc.cc @@ -77,7 +77,8 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill, vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP); /* add additional spacing if necessary */ - if (GTK_IS_VBOX(parent_box)) + if (GTK_IS_ORIENTABLE(parent_box) && + gtk_orientable_get_orientation(GTK_ORIENTABLE(parent_box)) == GTK_ORIENTATION_VERTICAL) { GList *list = gtk_container_get_children(GTK_CONTAINER(parent_box)); if (list) @@ -178,9 +179,11 @@ GtkWidget *pref_spacer(GtkWidget *parent_box, gboolean padding) GtkWidget *pref_line(GtkWidget *parent_box, gboolean padding) { + GtkOrientation orientation; GtkWidget *spacer; - spacer = gtk_separator_new(GTK_IS_HBOX(parent_box) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL); + orientation = gtk_orientable_get_orientation(GTK_ORIENTABLE(parent_box)); + spacer = gtk_separator_new((orientation == GTK_ORIENTATION_HORIZONTAL) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL); gq_gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2); gtk_widget_show(spacer); @@ -752,15 +755,15 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar, #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-function" -void pref_toolbar_button_set_icon_unused(GtkWidget *button, GtkWidget *widget, const gchar *stock_id) +void pref_toolbar_button_set_icon_unused(GtkWidget *button, GtkWidget *widget, const gchar *icon_name) { if (widget) { gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), widget); } - else if (stock_id) + else if (icon_name) { - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(button), stock_id); + gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(button), icon_name); } } -- 2.20.1