aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-07-31 10:19:05 -0400
committerMichael Mann <mmann78@netscape.net>2016-07-31 15:30:19 +0000
commit7855160bab3200fcf76413972f7a816a8d92fc3d (patch)
treec4f94b475d562bfde19142c40dee3de4bd190b91 /ui/gtk
parent9f4a294f22f8452a695a3cb663f12105fd881f82 (diff)
lbm_uimflow_dlg.c: Pacify another GTK checkAPIs.pl warning.
Add another "Wireshark" macros to old-gtk-compat.h for GTK API that has been deprecated. Change-Id: Icae4ebae365329fad076324c23d5cee4c89893b5 Reviewed-on: https://code.wireshark.org/review/16803 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/lbm_uimflow_dlg.c2
-rw-r--r--ui/gtk/old-gtk-compat.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c
index b0993547b6..bf239f45f3 100644
--- a/ui/gtk/lbm_uimflow_dlg.c
+++ b/ui/gtk/lbm_uimflow_dlg.c
@@ -373,7 +373,7 @@ static void lbmc_uim_flow_graph_dlg_create(void)
#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_can_default(bt_cancel, TRUE);
#else
- GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT);
+ WS_GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT);
#endif
gtk_widget_set_tooltip_text(bt_cancel, "Cancel this dialog");
window_set_cancel_button(flow_graph_dlg_w, bt_cancel, window_cancel_button_cb);
diff --git a/ui/gtk/old-gtk-compat.h b/ui/gtk/old-gtk-compat.h
index 634a85933c..2d4ba346d2 100644
--- a/ui/gtk/old-gtk-compat.h
+++ b/ui/gtk/old-gtk-compat.h
@@ -58,6 +58,7 @@
# define gtk_widget_set_window(x, y) (x)->window = (y)
# define gtk_widget_set_can_default(w,y) if(y==TRUE){GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);}else{GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_DEFAULT);}
# define gtk_widget_set_can_focus(w,y) if(y==TRUE){GTK_WIDGET_SET_FLAGS (w, GTK_CAN_FOCUS);}else{GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_FOCUS);}
+# define WS_GTK_WIDGET_SET_FLAGS GTK_WIDGET_SET_FLAGS
#endif
#if !GTK_CHECK_VERSION (2, 20, 0)