diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-09-18 19:55:42 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-09-26 22:18:18 -0400 |
| commit | eac1959d2c843dfc55353ffc89c16b74cb26e9bc (patch) | |
| tree | 214f431642a466bcf016a317a3d39e8a95772ca9 /gtk/gtkassistant.c | |
| parent | 3b8184cfee90f8f4e13ae64919a6a08921f78b8a (diff) | |
| download | gtk+-eac1959d2c843dfc55353ffc89c16b74cb26e9bc.tar.gz | |
Move destroy signal to GtkWidget
Also make GtkWidget derive from GInitiallyUnowned
Diffstat (limited to 'gtk/gtkassistant.c')
| -rw-r--r-- | gtk/gtkassistant.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 00b40606c9..ce3d8d0a6a 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -114,7 +114,7 @@ struct _GtkAssistantPrivate static void gtk_assistant_class_init (GtkAssistantClass *class); static void gtk_assistant_init (GtkAssistant *assistant); -static void gtk_assistant_destroy (GtkObject *object); +static void gtk_assistant_destroy (GtkWidget *widget); static void gtk_assistant_style_set (GtkWidget *widget, GtkStyle *old_style); static void gtk_assistant_size_request (GtkWidget *widget, @@ -200,17 +200,14 @@ static void gtk_assistant_class_init (GtkAssistantClass *class) { GObjectClass *gobject_class; - GtkObjectClass *object_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; gobject_class = (GObjectClass *) class; - object_class = (GtkObjectClass *) class; widget_class = (GtkWidgetClass *) class; container_class = (GtkContainerClass *) class; - object_class->destroy = gtk_assistant_destroy; - + widget_class->destroy = gtk_assistant_destroy; widget_class->style_set = gtk_assistant_style_set; widget_class->size_request = gtk_assistant_size_request; widget_class->size_allocate = gtk_assistant_size_allocate; @@ -1005,9 +1002,9 @@ remove_page (GtkAssistant *assistant, } static void -gtk_assistant_destroy (GtkObject *object) +gtk_assistant_destroy (GtkWidget *widget) { - GtkAssistant *assistant = GTK_ASSISTANT (object); + GtkAssistant *assistant = GTK_ASSISTANT (widget); GtkAssistantPrivate *priv = assistant->priv; if (priv->header_image) @@ -1056,9 +1053,9 @@ gtk_assistant_destroy (GtkObject *object) priv->current_page = NULL; while (priv->pages) - remove_page (GTK_ASSISTANT (object), priv->pages); - - GTK_OBJECT_CLASS (gtk_assistant_parent_class)->destroy (object); + remove_page (assistant, priv->pages); + + GTK_WIDGET_CLASS (gtk_assistant_parent_class)->destroy (widget); } static GList* |