build with GTK_DISABLE_DEPRECATED.

[~andy/gtk] / gtk / gtkitem.c

diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index 38a47580f6abf6418869cf33a598dd4838c5fd09..b45f91543ab8851a47ae5499e4bc3bd43f1dc559 100644 (file)
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -39,8 +39,6 @@ enum {
 };
 
 
-static void gtk_item_class_init (GtkItemClass     *klass);
-static void gtk_item_init       (GtkItem          *item);
 static void gtk_item_realize    (GtkWidget        *widget);
 static gint gtk_item_enter      (GtkWidget        *widget,
                                 GdkEventCrossing *event);
@@ -50,34 +48,7 @@ static gint gtk_item_leave      (GtkWidget        *widget,
 
 static guint item_signals[LAST_SIGNAL] = { 0 };
 
-
-GType
-gtk_item_get_type (void)
-{
-  static GType item_type = 0;
-
-  if (!item_type)
-    {
-      static const GTypeInfo item_info =
-      {
-       sizeof (GtkItemClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_item_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkItem),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_item_init,
-       NULL,           /* value_table */
-      };
-
-      item_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkItem"),
-                                         &item_info, G_TYPE_FLAG_ABSTRACT);
-    }
-
-  return item_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkItem, gtk_item, GTK_TYPE_BIN)
 
 static void
 gtk_item_class_init (GtkItemClass *class)
@@ -154,8 +125,6 @@ gtk_item_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_ITEM (widget));
-
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
   attributes.x = widget->allocation.x;