summaryrefslogtreecommitdiff
path: root/ui/gtk/dlg_utils.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-08-01 13:41:40 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-08-01 13:41:40 +0000
commit1cd8b5b0cc7b43eaf3a8e2ca64033615abcb54cc (patch)
treee2e09b2b1cd6c7792b81d794996483acd4874f75 /ui/gtk/dlg_utils.c
parent2303b8dcfcf76d98c8e98c3feafe778267a1415e (diff)
downloadwireshark-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/dlg_utils.c')
-rw-r--r--ui/gtk/dlg_utils.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c
index 80ad688af2..a850716221 100644
--- a/ui/gtk/dlg_utils.c
+++ b/ui/gtk/dlg_utils.c
@@ -48,11 +48,7 @@ dlg_button_new(GtkWidget *hbox, GtkWidget *button_hbox, const gchar *stock_id)
GtkWidget *button;
button = gtk_button_new_from_stock(stock_id);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_can_default(button, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#endif
g_object_set_data(G_OBJECT(hbox), stock_id, button);
gtk_box_pack_end(GTK_BOX(button_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
@@ -250,11 +246,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
/* do we have a help button? -> special handling for it */
if (help) {
button = gtk_button_new_from_stock(help);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_can_default(button, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#endif
g_object_set_data(G_OBJECT(hbox), help, button);
gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
@@ -264,11 +256,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
/* do we have a copy button? -> special handling for it */
if (copy) {
button = gtk_button_new_from_stock(copy);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_can_default(button, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#endif
g_object_set_data(G_OBJECT(hbox), copy, button);
gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
@@ -297,11 +285,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
/* do we have a map button? -> special handling for it */
if (map) {
button = gtk_button_new_from_stock(map);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_can_default(button, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#endif
g_object_set_data(G_OBJECT(hbox), map, button);
gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);