diff options
Diffstat (limited to 'gtk/simple_dialog.c')
| -rw-r--r-- | gtk/simple_dialog.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 1c3b11762a..1dde9f2d55 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.13 2002/11/03 17:38:34 oabad Exp $ + * $Id: simple_dialog.c,v 1.14 2002/11/11 15:39:06 oabad Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -38,6 +38,7 @@ #include "gtkglobals.h" #include "simple_dialog.h" #include "dlg_utils.h" +#include "compat_macros.h" #include "image/eexcl3d64.xpm" #include "image/eicon3d64.xpm" @@ -94,7 +95,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { gtk_container_border_width(GTK_CONTAINER(win), 7); - gtk_object_set_data(GTK_OBJECT(win), bm_key, btn_mask); + OBJECT_SET_DATA(win, bm_key, btn_mask); /* Container for our rows */ main_vb = gtk_vbox_new(FALSE, 5); @@ -134,14 +135,10 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { #if GTK_MAJOR_VERSION < 2 ok_btn = gtk_button_new_with_label ("OK"); - gtk_signal_connect_object(GTK_OBJECT(ok_btn), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), - GTK_OBJECT(win)); #else ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK); - g_signal_connect_swapped(G_OBJECT(ok_btn), "clicked", - G_CALLBACK(gtk_widget_destroy), G_OBJECT (win)); #endif + 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); gtk_widget_grab_default(ok_btn); @@ -150,13 +147,10 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { if (btn_mask && *btn_mask == ESD_BTN_CANCEL) { #if GTK_MAJOR_VERSION < 2 cancel_btn = gtk_button_new_with_label("Cancel"); - gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked", - GTK_SIGNAL_FUNC(simple_dialog_cancel_cb), (gpointer)win); #else cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - g_signal_connect(G_OBJECT(cancel_btn), "clicked", - G_CALLBACK(simple_dialog_cancel_cb), (gpointer)win); #endif + 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); gtk_widget_show(cancel_btn); @@ -180,7 +174,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { static void simple_dialog_cancel_cb(GtkWidget *w _U_, gpointer win) { - gint *btn_mask = (gint *) gtk_object_get_data(win, bm_key); + gint *btn_mask = (gint *) OBJECT_GET_DATA(win, bm_key); if (btn_mask) *btn_mask = ESD_BTN_CANCEL; |