diff options
| author | Olivier Abad <oabad@noos.fr> | 2002-11-03 17:38:45 +0000 |
|---|---|---|
| committer | Olivier Abad <oabad@noos.fr> | 2002-11-03 17:38:45 +0000 |
| commit | 05ef1fc475a3e569a641424a75b81f74d90ba8ca (patch) | |
| tree | e205dc0b1cb685304fd20edb3ebd398884c30ba3 /gtk/dlg_utils.c | |
| parent | ae2198ea4ecf9896ef2dc3ed54526fbfbe764077 (diff) | |
Merge gtk and gtk2 directories.
svn path=/trunk/; revision=6552
Diffstat (limited to 'gtk/dlg_utils.c')
| -rw-r--r-- | gtk/dlg_utils.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index 1151814038..af20eb362c 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -1,7 +1,7 @@ /* dlg_utils.c * Utilities to use when constructing dialogs * - * $Id: dlg_utils.c,v 1.8 2002/08/28 21:03:47 jmayer Exp $ + * $Id: dlg_utils.c,v 1.9 2002/11/03 17:38:33 oabad Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -45,11 +45,20 @@ dlg_window_new(const gchar *title) { GtkWidget *win; +#if GTK_MAJOR_VERSION < 2 win = gtk_window_new(GTK_WINDOW_DIALOG); +#else + win = gtk_window_new(GTK_WINDOW_TOPLEVEL); +#endif gtk_window_set_transient_for(GTK_WINDOW(win), GTK_WINDOW(top_level)); gtk_window_set_title(GTK_WINDOW(win), title); - gtk_signal_connect (GTK_OBJECT (win), "realize", - GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL); +#if GTK_MAJOR_VERSION < 2 + gtk_signal_connect(GTK_OBJECT (win), "realize", + GTK_SIGNAL_FUNC (window_icon_realize_cb), NULL); +#else + g_signal_connect(G_OBJECT (win), "realize", + G_CALLBACK (window_icon_realize_cb), NULL); +#endif return win; } @@ -65,8 +74,13 @@ dlg_window_new(const gchar *title) void dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button) { +#if GTK_MAJOR_VERSION < 2 gtk_signal_connect(GTK_OBJECT(widget), "activate", - GTK_SIGNAL_FUNC(dlg_activate), ok_button); + GTK_SIGNAL_FUNC(dlg_activate), ok_button); +#else + g_signal_connect(G_OBJECT(widget), "activate", + G_CALLBACK(dlg_activate), ok_button); +#endif } static void @@ -89,8 +103,13 @@ dlg_activate (GtkWidget *widget _U_, gpointer ok_button) void dlg_set_cancel(GtkWidget *widget, GtkWidget *cancel_button) { +#if GTK_MAJOR_VERSION < 2 gtk_signal_connect(GTK_OBJECT(widget), "key_press_event", - GTK_SIGNAL_FUNC(dlg_key_press), cancel_button); + GTK_SIGNAL_FUNC(dlg_key_press), cancel_button); +#else + g_signal_connect(G_OBJECT(widget), "key_press_event", + G_CALLBACK(dlg_key_press), cancel_button); +#endif } static gint @@ -107,6 +126,7 @@ dlg_key_press (GtkWidget *widget, GdkEventKey *event, gpointer cancel_button) return FALSE; } +#if GTK_MAJOR_VERSION < 2 /* Sigh. GTK+ appears not to acknowledge that it should be possible to attach mnemonics to anything other than menu items; provide routines to create radio and check buttons with labels that @@ -165,3 +185,4 @@ dlg_check_button_new_with_label_with_mnemonic(const gchar *label, dlg_fix_button_label(check_button, accel_group); return check_button; } +#endif |