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/gtkimagemenuitem.c | |
| parent | 3b8184cfee90f8f4e13ae64919a6a08921f78b8a (diff) | |
| download | gtk+-eac1959d2c843dfc55353ffc89c16b74cb26e9bc.tar.gz | |
Move destroy signal to GtkWidget
Also make GtkWidget derive from GInitiallyUnowned
Diffstat (limited to 'gtk/gtkimagemenuitem.c')
| -rw-r--r-- | gtk/gtkimagemenuitem.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index acfc7ba480..16d8ddca42 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -61,7 +61,7 @@ enum { static GtkActivatableIface *parent_activatable_iface; -static void gtk_image_menu_item_destroy (GtkObject *object); +static void gtk_image_menu_item_destroy (GtkWidget *widget); static void gtk_image_menu_item_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_image_menu_item_size_allocate (GtkWidget *widget, @@ -111,13 +111,11 @@ static void gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass) { GObjectClass *gobject_class = (GObjectClass*) klass; - GtkObjectClass *object_class = (GtkObjectClass*) klass; GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass; GtkContainerClass *container_class = (GtkContainerClass*) klass; - object_class->destroy = gtk_image_menu_item_destroy; - + widget_class->destroy = gtk_image_menu_item_destroy; widget_class->screen_changed = gtk_image_menu_item_screen_changed; widget_class->size_request = gtk_image_menu_item_size_request; widget_class->size_allocate = gtk_image_menu_item_size_allocate; @@ -197,7 +195,7 @@ gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass) TRUE, GTK_PARAM_READWRITE)); - g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPrivate)); + g_type_class_add_private (klass, sizeof (GtkImageMenuItemPrivate)); } static void @@ -309,16 +307,16 @@ gtk_image_menu_item_map (GtkWidget *widget) } static void -gtk_image_menu_item_destroy (GtkObject *object) +gtk_image_menu_item_destroy (GtkWidget *widget) { - GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object); + GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget); GtkImageMenuItemPrivate *priv = image_menu_item->priv; if (priv->image) gtk_container_remove (GTK_CONTAINER (image_menu_item), priv->image); - GTK_OBJECT_CLASS (gtk_image_menu_item_parent_class)->destroy (object); + GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->destroy (widget); } static void |