diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-08-01 13:41:40 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-08-01 13:41:40 +0000 |
commit | 1cd8b5b0cc7b43eaf3a8e2ca64033615abcb54cc (patch) | |
tree | e2e09b2b1cd6c7792b81d794996483acd4874f75 /ui/gtk/color_edit_dlg.c | |
parent | 2303b8dcfcf76d98c8e98c3feafe778267a1415e (diff) | |
download | wireshark-1cd8b5b0cc7b43eaf3a8e2ca64033615abcb54cc.tar.gz |
Get rid of some GTK_CHECK_VERSION instances by using compabillity macros.
svn path=/trunk/; revision=44186
Diffstat (limited to 'ui/gtk/color_edit_dlg.c')
-rw-r--r-- | ui/gtk/color_edit_dlg.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index db1d7e24a7..b46f8c0aac 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.c @@ -507,19 +507,11 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) g_object_get(color_sel_win, "ok-button", &color_sel_ok, NULL); g_object_set_data(G_OBJECT(color_sel_win), "color_sel_ok", color_sel_ok); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(color_sel_ok, TRUE); -#else - GTK_WIDGET_SET_FLAGS (color_sel_ok, GTK_CAN_DEFAULT); -#endif g_object_get(color_sel_win, "cancel-button", &color_sel_cancel, NULL); g_object_set_data(G_OBJECT(color_sel_win), "color_sel_cancel", color_sel_cancel); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(color_sel_cancel, TRUE); -#else - GTK_WIDGET_SET_FLAGS (color_sel_cancel, GTK_CAN_DEFAULT); -#endif window_set_cancel_button(color_sel_win, color_sel_cancel, NULL); /* ensure esc does req'd local cxl action. */ /* esc as handled by the */ /* gtk_color_selection_dialog widget */ @@ -527,11 +519,7 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) g_object_get(color_sel_win, "help-button", &color_sel_help, NULL); g_object_set_data(G_OBJECT(color_sel_win), "color_sel_help", color_sel_help); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(color_sel_help, TRUE); -#else - GTK_WIDGET_SET_FLAGS (color_sel_help, GTK_CAN_DEFAULT); -#endif g_signal_connect(color_sel_ok, "clicked", G_CALLBACK(color_sel_ok_cb), color_sel_win); g_signal_connect(color_sel_cancel, "clicked", G_CALLBACK(color_sel_cancel_cb), color_sel_win); |