using button compatibility macros

svn path=/trunk/; revision=9636

32 files changed, 150 insertions, 478 deletions

diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index fafafe9b32..2f32082d63 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -1,7 +1,7 @@
 /* bootp_stat.c
  * boop_stat   2003 Jean-Michel FAYARD
  *
- * $Id: bootp_stat.c,v 1.10 2004/01/03 18:05:55 sharpe Exp $
+ * $Id: bootp_stat.c,v 1.11 2004/01/10 16:27:39 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -337,11 +337,7 @@ gtk_dhcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 0c47519074..9edff46838 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
 /* capture_dlg.c
  * Routines for packet capture windows
  *
- * $Id: capture_dlg.c,v 1.92 2004/01/10 14:11:57 ulfl Exp $
+ * $Id: capture_dlg.c,v 1.93 2004/01/10 16:27:39 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -645,14 +645,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-  ok_bt = BUTTON_NEW_FROM_STOCK(STOCK_OK);
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(ok_bt, "clicked", capture_prep_ok_cb, cap_open_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 
-  cancel_bt = BUTTON_NEW_FROM_STOCK(STOCK_CANCEL);
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(cancel_bt, "clicked", capture_prep_close_cb, cap_open_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 70afacb3ae..3fb1ff66a6 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,7 +1,7 @@
 /* capture_prefs.c
  * Dialog box for capture preferences
  *
- * $Id: capture_prefs.c,v 1.24 2003/12/21 12:17:59 ulfl Exp $
+ * $Id: capture_prefs.c,v 1.25 2004/01/10 16:27:39 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -348,11 +348,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
 			TRUE, FALSE, 0);
 	gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-	ok_bt = gtk_button_new_with_label ("OK");
-#else
-	ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+	ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
 
 	/* Connect the OK button callback */
 	SIGNAL_CONNECT(ok_bt, "clicked", ifopts_edit_ok_cb, ifopts_edit_dlg);
@@ -361,11 +357,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
 	gtk_widget_grab_default(ok_bt);
 	gtk_widget_show(ok_bt);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-	cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 
 	/* Connect the Cancel button callback to destroy the widget */
 	SIGNAL_CONNECT(cancel_bt, "clicked", ifopts_edit_close_cb, ifopts_edit_dlg);
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index e29a64053f..19e712cb17 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
 /* color_dlg.c
  * Definitions for dialog boxes for color filters
  *
- * $Id: color_dlg.c,v 1.31 2004/01/10 14:11:58 ulfl Exp $
+ * $Id: color_dlg.c,v 1.32 2004/01/10 16:27:40 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -240,7 +240,7 @@ colorize_dialog_new (char *filter)
   gtk_widget_show (order_vbox);
   gtk_container_add(GTK_CONTAINER(order_fr), order_vbox);
 
-  color_filter_up = BUTTON_NEW_FROM_STOCK(STOCK_GO_UP);
+  color_filter_up = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP);
   gtk_widget_ref (color_filter_up);
   OBJECT_SET_DATA_FULL(color_win, "color_filter_up", color_filter_up, gtk_widget_unref);
   WIDGET_SET_SIZE (color_filter_up, -1, 20);
@@ -255,7 +255,7 @@ colorize_dialog_new (char *filter)
   gtk_widget_show (order_move_label);
   gtk_box_pack_start (GTK_BOX (order_vbox), order_move_label, FALSE, FALSE, 0);
 
-  color_filter_down = BUTTON_NEW_FROM_STOCK(STOCK_GO_DOWN);
+  color_filter_down = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN);
   gtk_widget_ref (color_filter_down);
   OBJECT_SET_DATA_FULL(color_win, "color_filter_down", color_filter_down,
                        gtk_widget_unref);
@@ -353,7 +353,7 @@ colorize_dialog_new (char *filter)
   gtk_widget_show (button_edit_vbox);
   gtk_container_add(GTK_CONTAINER(edit_fr), button_edit_vbox);
 
-  color_new = BUTTON_NEW_FROM_STOCK(STOCK_NEW);
+  color_new = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW);
   gtk_widget_ref (color_new);
   OBJECT_SET_DATA_FULL(color_win, "color_new", color_new, gtk_widget_unref);
   gtk_widget_show (color_new);
@@ -374,7 +374,7 @@ colorize_dialog_new (char *filter)
   gtk_tooltips_set_tip (tooltips, color_edit, ("Edit the selected filter"), NULL);
   gtk_widget_set_sensitive (color_edit, FALSE);
 
-  color_delete = BUTTON_NEW_FROM_STOCK(STOCK_DELETE);
+  color_delete = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE);
   gtk_widget_ref (color_delete);
   OBJECT_SET_DATA_FULL(color_win, "color_delete", color_delete, gtk_widget_unref);
   gtk_widget_show (color_delete);
@@ -397,14 +397,14 @@ colorize_dialog_new (char *filter)
   gtk_widget_show (okapply_vbox);
   gtk_box_pack_start (GTK_BOX (button_ok_hbox), okapply_vbox, TRUE, TRUE, 0);
 
-  color_ok = BUTTON_NEW_FROM_STOCK(STOCK_OK);
+  color_ok = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   gtk_widget_ref (color_ok);
   OBJECT_SET_DATA_FULL(color_win, "color_ok", color_ok, gtk_widget_unref);
   gtk_widget_show (color_ok);
   gtk_box_pack_start (GTK_BOX (okapply_vbox), color_ok, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, color_ok, ("Accept filter list; apply changes"), NULL);
 
-  color_apply = BUTTON_NEW_FROM_STOCK(STOCK_APPLY);
+  color_apply = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
   gtk_widget_ref (color_apply);
   OBJECT_SET_DATA_FULL(color_win, "color_apply", color_apply, gtk_widget_unref);
   gtk_widget_show (color_apply);
@@ -417,14 +417,14 @@ colorize_dialog_new (char *filter)
   gtk_widget_show (saverevert_vbox);
   gtk_box_pack_start (GTK_BOX (button_ok_hbox), saverevert_vbox, TRUE, TRUE, 0);
 
-  color_save = BUTTON_NEW_FROM_STOCK(STOCK_SAVE);
+  color_save = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE);
   gtk_widget_ref(color_save);
   OBJECT_SET_DATA_FULL(color_win, "color_save", color_save, gtk_widget_unref);
   gtk_widget_show(color_save);
   gtk_box_pack_start(GTK_BOX (saverevert_vbox), color_save, FALSE, FALSE, 0);
   gtk_tooltips_set_tip(tooltips, color_save, ("Save all filters to disk"), NULL);
 
-  color_revert = BUTTON_NEW_FROM_STOCK(STOCK_REVERT_TO_SAVED);
+  color_revert = BUTTON_NEW_FROM_STOCK(GTK_STOCK_REVERT_TO_SAVED);
   gtk_widget_ref(color_revert);
   OBJECT_SET_DATA_FULL(color_win, "color_revert", color_revert, gtk_widget_unref);
   gtk_widget_show(color_revert);
@@ -449,7 +449,7 @@ colorize_dialog_new (char *filter)
   gtk_box_pack_start(GTK_BOX (importexport_vbox), color_import, FALSE, FALSE, 0);
   gtk_tooltips_set_tip(tooltips, color_import, ("Include filters from specified file"), NULL);
 
-  color_cancel = BUTTON_NEW_FROM_STOCK(STOCK_CANCEL);
+  color_cancel = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   gtk_widget_ref (color_cancel);
   OBJECT_SET_DATA_FULL(color_win, "color_cancel", color_cancel, gtk_widget_unref);
   gtk_widget_show (color_cancel);
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index 2c43623ba2..e364d0b704 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c,v 1.16 2003/03/10 02:06:33 jmayer Exp $
+ * $Id: column_prefs.c,v 1.17 2004/01/10 16:27:40 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -100,20 +100,12 @@ column_prefs_show() {
   gtk_container_add(GTK_CONTAINER(top_hb), list_bb);
   gtk_widget_show(list_bb);
 
-#if GTK_MAJOR_VERSION < 2
-  new_bt = gtk_button_new_with_label ("Add New");
-#else
-  new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW);
-#endif
+  new_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW);
   SIGNAL_CONNECT(new_bt, "clicked", column_list_new_cb, NULL);
   gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
   gtk_widget_show(new_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  del_bt = gtk_button_new_with_label ("Delete");
-#else
-  del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE);
-#endif
+  del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE);
   gtk_widget_set_sensitive(del_bt, FALSE);
   SIGNAL_CONNECT(del_bt, "clicked", column_list_delete_cb, NULL);
   gtk_container_add(GTK_CONTAINER(list_bb), del_bt);
@@ -123,21 +115,13 @@ column_prefs_show() {
   gtk_container_add(GTK_CONTAINER(list_bb), arrow_hb);
   gtk_widget_show(arrow_hb);
 
-#if GTK_MAJOR_VERSION < 2
-  up_bt = gtk_button_new_with_label("Up");
-#else
-  up_bt = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
-#endif
+  up_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP);
   gtk_widget_set_sensitive(up_bt, FALSE);
   SIGNAL_CONNECT(up_bt, "clicked", column_arrow_cb, NULL);
   gtk_box_pack_start(GTK_BOX(arrow_hb), up_bt, TRUE, TRUE, 0);
   gtk_widget_show(up_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  dn_bt = gtk_button_new_with_label("Down");
-#else
-  dn_bt = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
-#endif
+  dn_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN);
   gtk_widget_set_sensitive(dn_bt, FALSE);
   SIGNAL_CONNECT(dn_bt, "clicked", column_arrow_cb, NULL);
   gtk_box_pack_start(GTK_BOX(arrow_hb), dn_bt, TRUE, TRUE, 0);
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 7302e70d9e..40991d9392 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -1,7 +1,7 @@
 /* compat_macros.h
  * GTK-related Global defines, etc.
  *
- * $Id: compat_macros.h,v 1.5 2004/01/10 14:10:43 ulfl Exp $
+ * $Id: compat_macros.h,v 1.6 2004/01/10 16:27:40 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -73,15 +73,23 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name)
 #define ITEM_FACTORY_STOCK_ENTRY(path, accelerator, callback, action, data) \
 {path, accelerator, GTK_MENU_FUNC(callback), action, NULL}
 
-#define STOCK_OK        "OK"
-#define STOCK_CANCEL    "Cancel"
-#define STOCK_NEW       "New"
-#define STOCK_DELETE    "Delete"
-#define STOCK_GO_UP     "Up"
-#define STOCK_GO_DOWN   "Down"
-#define STOCK_APPLY     "Apply"
-#define STOCK_SAVE      "Save"
-#define STOCK_REVERT_TO_SAVED "Revert"
+#define GTK_STOCK_APPLY             "Apply"
+#define GTK_STOCK_CANCEL            "Cancel"
+#define GTK_STOCK_CLEAR             "Clear"
+#define GTK_STOCK_CLOSE             "Close"
+#define GTK_STOCK_COPY              "Copy"
+#define GTK_STOCK_DELETE            "Delete"
+#define GTK_STOCK_GO_DOWN           "Down"
+#define GTK_STOCK_GO_UP             "Up"
+#define GTK_STOCK_HELP              "Help"
+#define GTK_STOCK_NEW               "New"
+#define GTK_STOCK_OK                "OK"
+#define GTK_STOCK_PRINT             "Print"
+#define GTK_STOCK_REVERT_TO_SAVED   "Revert"
+#define GTK_STOCK_SAVE              "Save"
+#define GTK_STOCK_SAVE_AS           "Save As"
+#define GTK_STOCK_SELECT_COLOR      "Color"
+#define GTK_STOCK_SELECT_FONT       "Font"
 
 #define BUTTON_NEW_FROM_STOCK(stock_id) \
 gtk_button_new_with_label(stock_id);
@@ -91,7 +99,8 @@ dlg_check_button_new_with_label_with_mnemonic(label_text, accel_group)
 
 #define RADIO_BUTTON_NEW_WITH_MNEMONIC(radio_group, label_text, accel_group) \
 dlg_radio_button_new_with_label_with_mnemonic( \
-    gtk_radio_button_group(GTK_RADIO_BUTTON(radio_group)), label_text, accel_group)
+    radio_group ? gtk_radio_button_group(GTK_RADIO_BUTTON(radio_group)) : NULL, \
+    label_text, accel_group)
 
 #define TOGGLE_BUTTON_NEW_WITH_MNEMONIC(label_text, accel_group) \
 dlg_toggle_button_new_with_label_with_mnemonic(label_text, accel_group)
@@ -137,16 +146,6 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
 #define ITEM_FACTORY_STOCK_ENTRY(path, accelerator, callback, action, data) \
 {path, accelerator, GTK_MENU_FUNC(callback), action, "<StockItem>", data}
 
-#define STOCK_OK        GTK_STOCK_OK
-#define STOCK_CANCEL    GTK_STOCK_CANCEL
-#define STOCK_NEW       GTK_STOCK_NEW
-#define STOCK_DELETE    GTK_STOCK_DELETE
-#define STOCK_GO_UP     GTK_STOCK_GO_UP
-#define STOCK_GO_DOWN   GTK_STOCK_GO_DOWN
-#define STOCK_APPLY     GTK_STOCK_APPLY
-#define STOCK_SAVE      GTK_STOCK_SAVE
-#define STOCK_REVERT_TO_SAVED   GTK_STOCK_REVERT_TO_SAVED
-
 #define BUTTON_NEW_FROM_STOCK(stock_id) \
 gtk_button_new_from_stock(stock_id);
 
@@ -154,7 +153,8 @@ gtk_button_new_from_stock(stock_id);
 gtk_check_button_new_with_mnemonic(label_text)
 
 #define RADIO_BUTTON_NEW_WITH_MNEMONIC(radio_group, label_text, accel_group) \
-gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_group), label_text)
+gtk_radio_button_new_with_mnemonic_from_widget( \
+    radio_group ? GTK_RADIO_BUTTON(radio_group) : NULL, label_text)
 
 #define TOGGLE_BUTTON_NEW_WITH_MNEMONIC(label_text, accel_group) \
 gtk_toggle_button_new_with_mnemonic(label_text)
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 710a933ce2..07ad69d402 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.37 2004/01/03 18:05:55 sharpe Exp $
+ * $Id: dcerpc_stat.c,v 1.38 2004/01/10 16:27:40 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -640,11 +640,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 9eced2c32a..07ffff29f9 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
 /* decode_as_dlg.c
  *
- * $Id: decode_as_dlg.c,v 1.33 2003/09/07 00:59:07 guy Exp $
+ * $Id: decode_as_dlg.c,v 1.34 2004/01/10 16:27:40 ulfl Exp $
  *
  * Routines to modify dissector tables on the fly.
  *
@@ -548,14 +548,11 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_)
     gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 #if GTK_MAJOR_VERSION < 2
     gtk_widget_set_sensitive(button, (list->rows != 0));
-
-    ok_bt = gtk_button_new_with_label("OK");
 #else
     gtk_widget_set_sensitive(button,
                              gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter));
-
-    ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
 #endif
+    ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
     SIGNAL_CONNECT(ok_bt, "clicked", decode_show_ok_cb, decode_show_w);
     GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), ok_bt, FALSE, FALSE, 0);
@@ -1489,21 +1486,13 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_)
     gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 10);
 
-#if GTK_MAJOR_VERSION < 2
-    ok_bt = gtk_button_new_with_label("OK");
-#else
-    ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+    ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
     SIGNAL_CONNECT(ok_bt, "clicked", decode_ok_cb, decode_w);
     GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), ok_bt, FALSE, FALSE, 0);
     gtk_widget_grab_default(ok_bt);
 
-#if GTK_MAJOR_VERSION < 2
-    apply_bt = gtk_button_new_with_label("Apply");
-#else
-    apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+    apply_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
     SIGNAL_CONNECT(apply_bt, "clicked", decode_apply_cb, decode_w);
     GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), apply_bt, FALSE, FALSE, 0);
@@ -1513,11 +1502,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_)
     GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 
-#if GTK_MAJOR_VERSION < 2
-    cancel_bt = gtk_button_new_with_label("Cancel");
-#else
-    cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+    cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
     SIGNAL_CONNECT(cancel_bt, "clicked", decode_cancel_cb, decode_w);
     GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), cancel_bt, FALSE, FALSE, 0);
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index cb2905a9a9..690fbe5bb0 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: dfilter_expr_dlg.c,v 1.44 2003/11/25 13:20:36 sahlberg Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.45 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1420,11 +1420,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     gtk_container_add(GTK_CONTAINER(main_vb), list_bb);
     gtk_widget_show(list_bb);
 
-#if GTK_MAJOR_VERSION < 2
-    accept_bt = gtk_button_new_with_label("Accept");
-#else
-    accept_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+    accept_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
     gtk_widget_set_sensitive(accept_bt, FALSE);
     SIGNAL_CONNECT(accept_bt, "clicked", dfilter_expr_dlg_accept_cb, filter_te);
     GTK_WIDGET_SET_FLAGS(accept_bt, GTK_CAN_DEFAULT);
@@ -1435,11 +1431,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     gtk_widget_show(accept_bt);
     gtk_widget_show(alignment);
 
-#if GTK_MAJOR_VERSION < 2
-    close_bt = gtk_button_new_with_label("Close");
-#else
-    close_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+    close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
     SIGNAL_CONNECT(close_bt, "clicked", dfilter_expr_dlg_cancel_cb, window);
     alignment = gtk_alignment_new(0.0, 0.5, 1.0, 0.0);
     gtk_container_add(GTK_CONTAINER(alignment), close_bt);
diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index ed26950c81..13060dc12c 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,7 +1,7 @@
 /* display_opts.c
  * Routines for packet display windows
  *
- * $Id: display_opts.c,v 1.33 2004/01/01 13:41:09 ulfl Exp $
+ * $Id: display_opts.c,v 1.34 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -111,12 +111,8 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
   gtk_container_add(GTK_CONTAINER(display_opt_w), main_vb);
   gtk_widget_show(main_vb);
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Time of day",
+  button = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL, "_Time of day",
 							accel_group);
-#else
-  button = gtk_radio_button_new_with_mnemonic(NULL, "_Time of day");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == ABSOLUTE));
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_TIME_ABS_KEY, button);
@@ -124,42 +120,24 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
 
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
-               "_Date and time of day", accel_group);
-#else
-  button = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(button), "_Date and time of day");
-#endif
+  button = RADIO_BUTTON_NEW_WITH_MNEMONIC(
+               button, "_Date and time of day", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == ABSOLUTE_WITH_DATE));
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_DATE_TIME_ABS_KEY, button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
-               "Seconds since _beginning of capture", accel_group);
-#else
-  button = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(button), "Seconds since _beginning of capture");
-#endif
+  button = RADIO_BUTTON_NEW_WITH_MNEMONIC(
+               button, "Seconds since _beginning of capture", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == RELATIVE));
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_TIME_REL_KEY, button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
-               "Seconds since _previous packet", accel_group);
-#else
-  button = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(button), "Seconds since _previous packet");
-#endif
+  button = RADIO_BUTTON_NEW_WITH_MNEMONIC(
+               button, "Seconds since _previous packet", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == DELTA));
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_TIME_DELTA_KEY, button);
@@ -167,52 +145,32 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
   gtk_widget_show(button);
 
 #ifdef HAVE_LIBPCAP
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_check_button_new_with_label_with_mnemonic(
+  button = CHECK_BUTTON_NEW_WITH_MNEMONIC(
 		"_Automatic scrolling in live capture", accel_group);
-#else
-  button = gtk_check_button_new_with_mnemonic(
-		"_Automatic scrolling in live capture");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), auto_scroll_live);
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_AUTO_SCROLL_KEY, button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 #endif
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_check_button_new_with_label_with_mnemonic(
+  button = CHECK_BUTTON_NEW_WITH_MNEMONIC(
   		"Enable _MAC name resolution", accel_group);
-#else
-  button = gtk_check_button_new_with_mnemonic(
-  		"Enable _MAC name resolution");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
 		g_resolv_flags & RESOLV_MAC);
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_M_NAME_RESOLUTION_KEY, button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_check_button_new_with_label_with_mnemonic(
+  button = CHECK_BUTTON_NEW_WITH_MNEMONIC(
   		"Enable _network name resolution", accel_group);
-#else
-  button = gtk_check_button_new_with_mnemonic(
-  		"Enable _network name resolution");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
 		g_resolv_flags & RESOLV_NETWORK);
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_N_NAME_RESOLUTION_KEY, button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = dlg_check_button_new_with_label_with_mnemonic(
+  button = CHECK_BUTTON_NEW_WITH_MNEMONIC(
   		"Enable _transport name resolution", accel_group);
-#else
-  button = gtk_check_button_new_with_mnemonic(
-  		"Enable _transport name resolution");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
 		g_resolv_flags & RESOLV_TRANSPORT);
   OBJECT_SET_DATA(display_opt_w, E_DISPLAY_T_NAME_RESOLUTION_KEY, button);
@@ -226,32 +184,20 @@ display_opt_cb(GtkWidget *w _U_, gpointer d _U_) {
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_bt = gtk_button_new_with_label ("OK");
-#else
-  ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(ok_bt, "clicked", display_opt_ok_cb, display_opt_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  apply_bt = gtk_button_new_with_label ("Apply");
-#else
-  apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+  apply_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
   SIGNAL_CONNECT(apply_bt, "clicked", display_opt_apply_cb, display_opt_w);
   GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), apply_bt, TRUE, TRUE, 0);
   gtk_widget_show(apply_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-  cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(cancel_bt, "clicked", display_opt_close_cb, display_opt_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 528a708179..68bfe0f667 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
 /* fc_stat.c
  * fc_stat   2003 Ronnie Sahlberg
  *
- * $Id: fc_stat.c,v 1.17 2004/01/03 18:05:56 sharpe Exp $
+ * $Id: fc_stat.c,v 1.18 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -291,11 +291,7 @@ gtk_fcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index be06ceba75..b7034ac585 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
  * (This used to be a notebook page under "Preferences", hence the
  * "prefs" in the file name.)
  *
- * $Id: filter_prefs.c,v 1.46 2003/12/04 00:45:38 guy Exp $
+ * $Id: filter_prefs.c,v 1.47 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -420,11 +420,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     gtk_container_add(GTK_CONTAINER(top_hb), list_bb);
     gtk_widget_show(list_bb);
 
-#if GTK_MAJOR_VERSION < 2
-    new_bt = gtk_button_new_with_label ("New");
-#else
-    new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW);
-#endif
+    new_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW);
     SIGNAL_CONNECT(new_bt, "clicked", filter_new_bt_clicked_cb, filter_list_p);
     gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
     gtk_widget_show(new_bt);
@@ -437,11 +433,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     gtk_container_add(GTK_CONTAINER(list_bb), chg_bt);
     gtk_widget_show(chg_bt);
 
-#if GTK_MAJOR_VERSION < 2
-    copy_bt = gtk_button_new_with_label ("Copy");
-#else
-    copy_bt = gtk_button_new_from_stock(GTK_STOCK_COPY);
-#endif
+    copy_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_COPY);
     gtk_widget_set_sensitive(copy_bt, FALSE);
     SIGNAL_CONNECT(copy_bt, "clicked", filter_copy_bt_clicked_cb,
                    filter_list_p);
@@ -450,11 +442,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     gtk_container_add(GTK_CONTAINER(list_bb), copy_bt);
     gtk_widget_show(copy_bt);
 
-#if GTK_MAJOR_VERSION < 2
-    del_bt = gtk_button_new_with_label ("Delete");
-#else
-    del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE);
-#endif
+    del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE);
     gtk_widget_set_sensitive(del_bt, FALSE);
     SIGNAL_CONNECT(del_bt, "clicked", filter_del_bt_clicked_cb, filter_list_p);
     OBJECT_SET_DATA(main_w, E_FILT_DEL_BT_KEY, del_bt);
@@ -613,11 +601,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
          * We have a filter text entry that we can fill in if
          * the "OK" button is clicked, so put in an "OK" button.
          */
-#if GTK_MAJOR_VERSION < 2
-        ok_bt = gtk_button_new_with_label ("OK");
-#else
-        ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+        ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
         SIGNAL_CONNECT(ok_bt, "clicked", filter_dlg_ok_cb, NULL);
         GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), ok_bt, TRUE, TRUE, 0);
@@ -634,32 +618,20 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     }
 
     if (construct_args->wants_apply_button) {
-#if GTK_MAJOR_VERSION < 2
-        apply_bt = gtk_button_new_with_label ("Apply");
-#else
-        apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+        apply_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
         SIGNAL_CONNECT(apply_bt, "clicked", filter_dlg_apply_cb, NULL);
         GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), apply_bt, TRUE, TRUE, 0);
         gtk_widget_show(apply_bt);
     }
 
-#if GTK_MAJOR_VERSION < 2
-    save_bt = gtk_button_new_with_label ("Save");
-#else
-    save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-#endif
+    save_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE);
     SIGNAL_CONNECT(save_bt, "clicked", filter_dlg_save_cb, filter_list_p);
     GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), save_bt, TRUE, TRUE, 0);
     gtk_widget_show(save_bt);
 
-#if GTK_MAJOR_VERSION < 2
-    close_bt = gtk_button_new_with_label ("Close");
-#else
-    close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-#endif
+    close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
     SIGNAL_CONNECT(close_bt, "clicked", filter_dlg_close_cb, main_w);
     GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), close_bt, TRUE, TRUE, 0);
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index b87097802e..115ffe6ca0 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,7 +1,7 @@
 /* find_dlg.c
  * Routines for "find frame" window
  *
- * $Id: find_dlg.c,v 1.40 2003/12/04 00:45:38 guy Exp $
+ * $Id: find_dlg.c,v 1.41 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -165,25 +165,15 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(direction_frame), direction_hb);
   gtk_widget_show(direction_hb);
 
-#if GTK_MAJOR_VERSION < 2
-  forward_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Forward",
-                                                             accel_group);
-#else
-  forward_rb = gtk_radio_button_new_with_mnemonic(NULL, "_Forward");
-#endif
+  forward_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL,
+      "_Forward", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(forward_rb), !cfile.sbackward);
   gtk_box_pack_start(GTK_BOX(direction_hb), forward_rb, TRUE, TRUE, 0);
   gtk_widget_show(forward_rb);
 
 
-#if GTK_MAJOR_VERSION < 2
-  backward_rb = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(forward_rb)),
+  backward_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(forward_rb,
                "_Backward", accel_group);
-#else
-  backward_rb = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(forward_rb), "_Backward");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(backward_rb), cfile.sbackward);
   gtk_box_pack_start(GTK_BOX(direction_hb), backward_rb, TRUE, TRUE, 0);
   gtk_widget_show(backward_rb);
@@ -201,26 +191,16 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(find_type_frame), hex_hb);
   gtk_widget_show(hex_hb);
 
-#if GTK_MAJOR_VERSION < 2
-  filter_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Display Filter",
+  filter_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL, "_Display Filter",
                                                              accel_group);
-#else
-  filter_rb = gtk_radio_button_new_with_mnemonic(NULL, "_Display Filter");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filter_rb), !cfile.hex && !cfile.ascii);
   gtk_box_pack_start(GTK_BOX(hex_hb), filter_rb, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, filter_rb, ("Search for data by display filter syntax.\ne.g. ip.addr==10.1.1.1"), NULL);
   gtk_widget_show(filter_rb);
 
   /* Hex */
-#if GTK_MAJOR_VERSION < 2
-  hex_rb = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(filter_rb)),
+  hex_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(filter_rb,
                "_Hex", accel_group);
-#else
-  hex_rb = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(filter_rb), "_Hex");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_rb), cfile.hex);
   gtk_box_pack_start(GTK_BOX(hex_hb), hex_rb, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, hex_rb, ("Search for data by hex string.\ne.g. fffffda5"), NULL);
@@ -228,14 +208,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* ASCII Search */
 
-#if GTK_MAJOR_VERSION < 2
-  ascii_rb = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(filter_rb)),
+  ascii_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(filter_rb,
                "_String", accel_group);
-#else
-  ascii_rb = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(filter_rb), "_String");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ascii_rb), cfile.ascii);
   gtk_box_pack_start(GTK_BOX(hex_hb), ascii_rb, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, ascii_rb, ("Search for data by string value.\ne.g. My String"), NULL);
@@ -253,26 +227,16 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(string_window_frame), data_hb);
   gtk_widget_show(data_hb);
 
-#if GTK_MAJOR_VERSION < 2
-  hex_data_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "Packet data",
-                                                             accel_group);
-#else
-  hex_data_rb = gtk_radio_button_new_with_mnemonic(NULL, "Packet data");
-#endif
+  hex_data_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(NULL, 
+                "Packet data", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_data_rb), !decode_data && !summary_data);
   gtk_box_pack_start(GTK_BOX(data_hb), hex_data_rb, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, hex_data_rb, ("Search for string in the packet data"), NULL);
   gtk_widget_show(hex_data_rb);
 
   /* Search Decode Window */
-#if GTK_MAJOR_VERSION < 2
-  decode_data_rb = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(hex_data_rb)),
+  decode_data_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(hex_data_rb,
                "Decoded packet", accel_group);
-#else
-  decode_data_rb = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(hex_data_rb), "Decoded packet");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(decode_data_rb), decode_data);
   gtk_box_pack_start(GTK_BOX(data_hb), decode_data_rb, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, decode_data_rb, ("Search for string in the decoded packet display (middle pane)"), NULL);
@@ -280,14 +244,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* Search Summary Window */
 
-#if GTK_MAJOR_VERSION < 2
-  summary_data_rb = dlg_radio_button_new_with_label_with_mnemonic(
-               gtk_radio_button_group(GTK_RADIO_BUTTON(hex_data_rb)),
+  summary_data_rb = RADIO_BUTTON_NEW_WITH_MNEMONIC(hex_data_rb,
                "Packet summary", accel_group);
-#else
-  summary_data_rb = gtk_radio_button_new_with_mnemonic_from_widget(
-               GTK_RADIO_BUTTON(hex_data_rb), "Packet summary");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(summary_data_rb), summary_data);
   gtk_box_pack_start(GTK_BOX(data_hb), summary_data_rb, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, summary_data_rb, ("Search for string in the Info column of the packet summary (top pane)"), NULL);
@@ -320,13 +278,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_border_width(GTK_CONTAINER(string_opt_frame), 5);
   gtk_widget_show(string_opt_frame);
 
-#if GTK_MAJOR_VERSION < 2
-  case_cb = dlg_check_button_new_with_label_with_mnemonic(
+  case_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
 		"Case Insensitive Search", accel_group);
-#else
-  case_cb = gtk_check_button_new_with_mnemonic(
-		"Case Insensitive Search");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(case_cb),
 		case_type);
   gtk_container_border_width(GTK_CONTAINER(case_cb), 1);
@@ -341,11 +294,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_bt = gtk_button_new_with_label ("OK");
-#else
-  ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(ok_bt, "clicked", find_frame_ok_cb, find_frame_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
@@ -353,11 +302,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-  cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(cancel_bt, "clicked", find_frame_close_cb, find_frame_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 5bb4d0ae86..ef7103d97e 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
 /* follow_dlg.c
  *
- * $Id: follow_dlg.c,v 1.33 2003/12/24 01:21:32 guy Exp $
+ * $Id: follow_dlg.c,v 1.34 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -388,11 +388,7 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
 	follow_info->carray_bt = radio_bt;
 
 	/* Create Close Button */
-#if GTK_MAJOR_VERSION < 2
-	button = gtk_button_new_with_label("Close");
-#else
-        button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-#endif
+    button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
 	SIGNAL_CONNECT_OBJECT(button, "clicked", gtk_widget_destroy,
                               streamwindow);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -409,20 +405,12 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 	/* Create Save As Button */
-#if GTK_MAJOR_VERSION < 2
-	button = gtk_button_new_with_label("Save As");
-#else
-        button = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
-#endif
+    button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS);
 	SIGNAL_CONNECT(button, "clicked", follow_save_as_cmd_cb, follow_info);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 	/* Create Print Button */
-#if GTK_MAJOR_VERSION < 2
-	button = gtk_button_new_with_label("Print");
-#else
-        button = gtk_button_new_from_stock(GTK_STOCK_PRINT);
-#endif
+    button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_PRINT);
 	SIGNAL_CONNECT(button, "clicked", follow_print_stream, follow_info);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index ae58ae6b33..7938e04b52 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,7 +1,7 @@
 /* goto_dlg.c
  * Routines for "go to packet" window
  *
- * $Id: goto_dlg.c,v 1.21 2003/11/28 19:02:41 ulfl Exp $
+ * $Id: goto_dlg.c,v 1.22 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -80,22 +80,14 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_bt = gtk_button_new_with_label ("OK");
-#else
-  ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(ok_bt, "clicked", goto_frame_ok_cb, goto_frame_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-  cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(cancel_bt, "clicked", goto_frame_close_cb, goto_frame_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 52e99f63e8..d9ae33b9f2 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
 /* gui_prefs.c
  * Dialog box for GUI preferences
  *
- * $Id: gui_prefs.c,v 1.50 2004/01/09 08:36:23 guy Exp $
+ * $Id: gui_prefs.c,v 1.51 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -294,20 +294,12 @@ gui_prefs_show(void)
 	SIGNAL_CONNECT(recent_files_count_max_te, "focus_out_event", recent_files_count_changed_cb, main_vb);
 
 	/* "Font..." button - click to open a font selection dialog box. */
-#if GTK_MAJOR_VERSION < 2
-	font_bt = gtk_button_new_with_label("Font...");
-#else
-        font_bt = gtk_button_new_from_stock(GTK_STOCK_SELECT_FONT);
-#endif
+    font_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SELECT_FONT);
 	SIGNAL_CONNECT(font_bt, "clicked", font_browse_cb, NULL);
 	gtk_table_attach_defaults( GTK_TABLE(main_tb), font_bt, 2, 3, 0, 1 );
 
 	/* "Colors..." button - click to open a color selection dialog box. */
-#if GTK_MAJOR_VERSION < 2
-	color_bt = gtk_button_new_with_label("Colors...");
-#else
-        color_bt = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
-#endif
+    color_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SELECT_COLOR);
 	SIGNAL_CONNECT(color_bt, "clicked", color_browse_cb, NULL);
 	gtk_table_attach_defaults( GTK_TABLE(main_tb), color_bt, 2, 3, 1, 2 );
 
@@ -860,21 +852,14 @@ color_browse_cb(GtkWidget *w, gpointer data _U_)
   gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_bt = gtk_button_new_with_label ("OK");
-#else
-  ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(ok_bt, "clicked", color_ok_cb, color_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
-#if GTK_MAJOR_VERSION < 2
-  cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-  cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT_OBJECT(cancel_bt, "clicked", gtk_widget_destroy, color_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index b9696a8085..10949526ba 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
 /* help_dlg.c
  *
- * $Id: help_dlg.c,v 1.40 2003/12/22 21:52:41 guy Exp $
+ * $Id: help_dlg.c,v 1.41 2004/01/10 16:27:41 ulfl Exp $
  *
  * Laurent Deniel <laurent.deniel@free.fr>
  *
@@ -186,16 +186,12 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
 
   gtk_widget_show(help_nb);
 
-  /* Buttons (only "Close" for now) */
+  /* Buttons (only "Ok" for now) */
   bbox = gtk_hbutton_box_new();
   /*bbox = gtk_hbox_new(FALSE, 1);*/
   gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
-#if GTK_MAJOR_VERSION < 2
-  close_bt = gtk_button_new_with_label("OK");
-#else
-  close_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(close_bt, "clicked", help_close_cb, help_w);
   GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
   gtk_container_add(GTK_CONTAINER(bbox), close_bt);
diff --git a/gtk/http_stat.c b/gtk/http_stat.c
index d7bde46313..894fef804e 100644
--- a/gtk/http_stat.c
+++ b/gtk/http_stat.c
@@ -1,7 +1,7 @@
 /* http_stat.c
  * http_stat   2003 Jean-Michel FAYARD
  *
- * $Id: http_stat.c,v 1.12 2004/01/03 18:05:56 sharpe Exp $
+ * $Id: http_stat.c,v 1.13 2004/01/10 16:27:41 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -582,11 +582,7 @@ gtk_httpstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index f5a9ac2b2d..c86bc09b70 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -1,7 +1,7 @@
 /* ldap_stat.c
  * ldap_stat   2003 Ronnie Sahlberg
  *
- * $Id: ldap_stat.c,v 1.5 2004/01/03 18:05:56 sharpe Exp $
+ * $Id: ldap_stat.c,v 1.6 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -326,11 +326,7 @@ gtk_ldapstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/main.c b/gtk/main.c
index bbd26618d3..aef144df1b 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.351 2004/01/09 08:36:23 guy Exp $
+ * $Id: main.c,v 1.352 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -230,11 +230,7 @@ about_ethereal( GtkWidget *w _U_, gpointer data _U_ ) {
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_btn = gtk_button_new_with_label ("OK");
-#else
-  ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_btn = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT_OBJECT(ok_btn, "clicked", gtk_widget_destroy, win);
   gtk_container_add(GTK_CONTAINER(bbox), ok_btn);
   GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT);
@@ -2889,21 +2885,13 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
     SIGNAL_CONNECT(filter_te, "activate", filter_activate_cb, filter_te);
     gtk_widget_show(filter_cm);
 
-#if GTK_MAJOR_VERSION < 2
-    filter_reset = gtk_button_new_with_label("Reset");
-#else
-    filter_reset = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
-#endif    
+    filter_reset = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLEAR);
     OBJECT_SET_DATA(filter_reset, E_DFILTER_TE_KEY, filter_te);
     SIGNAL_CONNECT(filter_reset, "clicked", filter_reset_cb, NULL);
     gtk_box_pack_start(GTK_BOX(stat_hbox), filter_reset, FALSE, TRUE, 1);
     gtk_widget_show(filter_reset);
 
-#if GTK_MAJOR_VERSION < 2
-    filter_apply = gtk_button_new_with_label("Apply");
-#else
-    filter_apply = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+    filter_apply = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
     OBJECT_SET_DATA(filter_apply, E_DFILTER_CM_KEY, filter_cm);
     SIGNAL_CONNECT(filter_apply, "clicked", filter_activate_cb, filter_te);
     gtk_box_pack_start(GTK_BOX(stat_hbox), filter_apply, FALSE, TRUE, 1);
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 9be4a0d49d..35b0c5e3dd 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,7 +1,7 @@
 /* plugins_dlg.c
  * Dialog boxes for plugins
  *
- * $Id: plugins_dlg.c,v 1.31 2003/11/28 00:08:35 ulfl Exp $
+ * $Id: plugins_dlg.c,v 1.32 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -129,11 +129,7 @@ tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
                               GTK_BUTTONBOX_SPREAD);
     gtk_widget_show(main_hbnbox);
 
-#if GTK_MAJOR_VERSION < 2
-    close_bn = gtk_button_new_with_label("OK");
-#else
-    close_bn = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+    close_bn = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
     gtk_container_add(GTK_CONTAINER(main_hbnbox), close_bn);
     GTK_WIDGET_SET_FLAGS(close_bn, GTK_CAN_DEFAULT);
 	gtk_widget_grab_default(close_bn);
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index dc5fa17cf7..a2de88db73 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.69 2004/01/01 13:29:16 ulfl Exp $
+ * $Id: prefs_dlg.c,v 1.70 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -569,42 +569,26 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   gtk_container_add(GTK_CONTAINER(cts.main_vb), bbox);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_bt = gtk_button_new_with_label ("OK");
-#else
-  ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(ok_bt, "clicked", prefs_main_ok_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  apply_bt = gtk_button_new_with_label ("Apply");
-#else
-  apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+  apply_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
   SIGNAL_CONNECT(apply_bt, "clicked", prefs_main_apply_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), apply_bt, TRUE, TRUE, 0);
   gtk_widget_show(apply_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  save_bt = gtk_button_new_with_label ("Save");
-#else
-  save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-#endif
+  save_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE);
   SIGNAL_CONNECT(save_bt, "clicked", prefs_main_save_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0);
   gtk_widget_show(save_bt);
 
-#if GTK_MAJOR_VERSION < 2
-  cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-  cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(cancel_bt, "clicked", prefs_main_cancel_cb, prefs_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 1dded144ac..7e5d3ef8e1 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
 /* print_dlg.c
  * Dialog boxes for printing
  *
- * $Id: print_dlg.c,v 1.53 2004/01/10 14:11:58 ulfl Exp $
+ * $Id: print_dlg.c,v 1.54 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -654,7 +654,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-  ok_bt = BUTTON_NEW_FROM_STOCK(STOCK_OK);
+  ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   OBJECT_SET_DATA(ok_bt, PRINT_FORMAT_RB_KEY, format_rb);
   OBJECT_SET_DATA(ok_bt, PRINT_DEST_CB_KEY, dest_cb);
 #ifndef _WIN32
@@ -673,7 +673,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   gtk_widget_grab_default(ok_bt);
   gtk_widget_show(ok_bt);
 
-  cancel_bt = BUTTON_NEW_FROM_STOCK(STOCK_CANCEL);
+  cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(cancel_bt, "clicked", print_close_cb, print_w);
   GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
   gtk_tooltips_set_tip (tooltips, cancel_bt, ("Cancel print and exit dialog"), NULL);
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index ecb1bf2655..70af41d213 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
 /* proto_dlg.c
  *
- * $Id: proto_dlg.c,v 1.28 2004/01/04 02:24:58 guy Exp $
+ * $Id: proto_dlg.c,v 1.29 2004/01/10 16:27:42 ulfl Exp $
  *
  * Laurent Deniel <laurent.deniel@free.fr>
  *
@@ -226,42 +226,26 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  button = gtk_button_new_with_label ("OK");
-#else
-  button = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(button, "clicked", proto_ok_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_grab_default(button);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = gtk_button_new_with_label ("Apply");
-#else
-  button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+  button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
   SIGNAL_CONNECT(button, "clicked", proto_apply_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = gtk_button_new_with_label ("Save");
-#else
-  button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-#endif
+  button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE);
   SIGNAL_CONNECT(button, "clicked", proto_save_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-#if GTK_MAJOR_VERSION < 2
-  button = gtk_button_new_with_label ("Cancel");
-#else
-  button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+  button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
   SIGNAL_CONNECT(button, "clicked", proto_cancel_cb, proto_w);
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   gtk_box_pack_start(GTK_BOX (bbox), button, TRUE, TRUE, 0);
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 502c938329..2336804a68 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -1,6 +1,6 @@
 /* proto_hier_stats_dlg.c
  *
- * $Id: proto_hier_stats_dlg.c,v 1.12 2002/11/11 15:39:06 oabad Exp $
+ * $Id: proto_hier_stats_dlg.c,v 1.13 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -310,11 +310,7 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
 	/* Close button */
-#if GTK_MAJOR_VERSION < 2
-	bt = gtk_button_new_with_label("Close");
-#else
-        bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-#endif
+    bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
 	SIGNAL_CONNECT_OBJECT(bt, "clicked", gtk_widget_destroy, dlg);
 	gtk_container_add(GTK_CONTAINER(bbox), bt);
 	GTK_WIDGET_SET_FLAGS(bt, GTK_CAN_DEFAULT);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index c5b00c9d14..9dc399c8d3 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.30 2004/01/03 18:05:57 sharpe Exp $
+ * $Id: rpc_stat.c,v 1.31 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -501,11 +501,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 1dde9f2d55..6451d9ff3f 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,7 +1,7 @@
 /* simple_dialog.c
  * Simple message dialog box routines.
  *
- * $Id: simple_dialog.c,v 1.14 2002/11/11 15:39:06 oabad Exp $
+ * $Id: simple_dialog.c,v 1.15 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -133,11 +133,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_btn = gtk_button_new_with_label ("OK");
-#else
-  ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  ok_btn = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT_OBJECT(ok_btn, "clicked", gtk_widget_destroy, win);
   gtk_container_add(GTK_CONTAINER(bbox), ok_btn);
   GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT);
@@ -145,11 +141,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) {
   gtk_widget_show(ok_btn);
 
   if (btn_mask && *btn_mask == ESD_BTN_CANCEL) {
-#if GTK_MAJOR_VERSION < 2
-    cancel_btn = gtk_button_new_with_label("Cancel");
-#else
-    cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+    cancel_btn = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
     SIGNAL_CONNECT(cancel_btn, "clicked", simple_dialog_cancel_cb, win);
     gtk_container_add(GTK_CONTAINER(bbox), cancel_btn);
     GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index fe676386ed..36550051cd 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.28 2004/01/03 18:05:57 sharpe Exp $
+ * $Id: smb_stat.c,v 1.29 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -331,11 +331,7 @@ gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c
index d5afe09d47..ed05cfb2fa 100644
--- a/gtk/supported_protos_dlg.c
+++ b/gtk/supported_protos_dlg.c
@@ -224,11 +224,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_)
   /*bbox = gtk_hbox_new(FALSE, 1);*/
   gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
-#if GTK_MAJOR_VERSION < 2
-  close_bt = gtk_button_new_with_label("OK");
-#else
-  close_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+  close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
   SIGNAL_CONNECT(close_bt, "clicked", supported_close_cb, supported_w);
   GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
   gtk_container_add(GTK_CONTAINER(bbox), close_bt);
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 925dc39587..9281f46307 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -2,7 +2,7 @@
  * Routines for display filter dialog used by gui taps
  * Copyright 2003 Lars Roland
  *
- * $Id: tap_dfilter_dlg.c,v 1.2 2003/12/19 23:41:55 guy Exp $
+ * $Id: tap_dfilter_dlg.c,v 1.3 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -214,11 +214,7 @@ gtk_tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, current_dlg->dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index f83d3f70d7..18ed4ba62a 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
  * By Pavel Mores <pvl@uh.cz>
  * Win32 port:  rwh@unifiedtech.com
  *
- * $Id: tcp_graph.c,v 1.42 2004/01/10 12:43:04 ulfl Exp $
+ * $Id: tcp_graph.c,v 1.43 2004/01/10 16:27:42 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -867,13 +867,8 @@ static void control_panel_create (struct graph *g)
 	control_panel_add_graph_type_page (g, notebook);
 
 	/* bottom buttons group */
-#if GTK_MAJOR_VERSION < 2
-	help = gtk_button_new_with_label ("Help");
-	close = gtk_button_new_with_label ("Close");
-#else
-        help = gtk_button_new_from_stock(GTK_STOCK_HELP);
-	close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-#endif
+    help = BUTTON_NEW_FROM_STOCK(GTK_STOCK_HELP);
+	close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
 	button_box = gtk_hbox_new (TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (button_box), help, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (button_box), close, TRUE, TRUE, 0);
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 435ec4e12b..e19e05e397 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -1,7 +1,7 @@
 /* wsp_stat.c
  * wsp_stat   2003 Jean-Michel FAYARD
  *
- * $Id: wsp_stat.c,v 1.10 2004/01/03 18:05:57 sharpe Exp $
+ * $Id: wsp_stat.c,v 1.11 2004/01/10 16:27:43 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -486,11 +486,7 @@ gtk_wspstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	gtk_widget_grab_default(start_button);
 	gtk_widget_show(start_button);
 
-#if GTK_MAJOR_VERSION < 2
-	cancel_button=gtk_button_new_with_label("Cancel");
-#else
-	cancel_button=gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+	cancel_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
 	SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg);
 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);