diff options
author | Manish Singh <yosh@gimp.org> | 2002-10-01 19:55:08 +0000 |
---|---|---|
committer | Manish Singh <yosh@src.gnome.org> | 2002-10-01 19:55:08 +0000 |
commit | 2eb145c26f7e173d94e1d9506f80b34ec991e13f (patch) | |
tree | 56f097277fb1f5e61ed455721cbabfb72d94f8e1 /gtk/gtkwindow-decorate.c | |
parent | 55c442718c44651525498239767fb2deeec4f9cb (diff) | |
download | gtk+-2eb145c26f7e173d94e1d9506f80b34ec991e13f.tar.gz |
Deprecation cleanup
Tue Oct 1 12:53:44 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkwindow-decorate.c gtkwindow.[ch]: Deprecation cleanup
Diffstat (limited to 'gtk/gtkwindow-decorate.c')
-rw-r--r-- | gtk/gtkwindow-decorate.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c index 2ef0c0d5bf..d65da6680f 100644 --- a/gtk/gtkwindow-decorate.c +++ b/gtk/gtkwindow-decorate.c @@ -22,7 +22,6 @@ */ #include "gtkprivate.h" -#include "gtksignal.h" #include "gtkwindow.h" #include "gtkmain.h" @@ -141,26 +140,26 @@ gtk_decorated_window_init (GtkWindow *window) gtk_window_set_has_frame (window, TRUE); - gtk_signal_connect (GTK_OBJECT (window), - "frame_event", - GTK_SIGNAL_FUNC (gtk_decorated_window_frame_event), - window); - gtk_signal_connect (GTK_OBJECT (window), - "focus_in_event", - GTK_SIGNAL_FUNC (gtk_decorated_window_focus_change), - window); - gtk_signal_connect (GTK_OBJECT (window), - "focus_out_event", - GTK_SIGNAL_FUNC (gtk_decorated_window_focus_change), - window); - gtk_signal_connect (GTK_OBJECT (window), - "realize", - GTK_SIGNAL_FUNC (gtk_decorated_window_realize), - window); - gtk_signal_connect (GTK_OBJECT (window), - "unrealize", - GTK_SIGNAL_FUNC (gtk_decorated_window_unrealize), - window); + g_signal_connect (window, + "frame_event", + G_CALLBACK (gtk_decorated_window_frame_event), + window); + g_signal_connect (window, + "focus_in_event", + G_CALLBACK (gtk_decorated_window_focus_change), + window); + g_signal_connect (window, + "focus_out_event", + G_CALLBACK (gtk_decorated_window_focus_change), + window); + g_signal_connect (window, + "realize", + G_CALLBACK (gtk_decorated_window_realize), + window); + g_signal_connect (window, + "unrealize", + G_CALLBACK (gtk_decorated_window_unrealize), + window); } static inline GtkWindowDecoration * @@ -282,7 +281,7 @@ gtk_decorated_window_unrealize (GtkWindow *window) if (deco->title_layout) { - g_object_unref (G_OBJECT (deco->title_layout)); + g_object_unref (deco->title_layout); deco->title_layout = NULL; } } @@ -489,11 +488,11 @@ gtk_decorated_window_button_release (GtkWidget *widget, event.send_event = TRUE; /* Synthesize delete_event */ - g_object_ref (G_OBJECT (event.window)); + g_object_ref (event.window); - gtk_main_do_event ((GdkEvent*)&event); + gtk_main_do_event ((GdkEvent *) &event); - g_object_unref (G_OBJECT (event.window)); + g_object_unref (event.window); } } |