Deprecation cleanup

Thu Oct 10 15:13:48 2002  Manish Singh  <yosh@gimp.org>

        * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c
        gtk/gtkimmulticontext.[ch] gtk/gtktreestore.[ch]: Deprecation
        cleanup

9 files changed, 82 insertions, 81 deletions

diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 3c6ba7971e..f29be5a241 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -17,13 +17,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#define GTK_DISABLE_DEPRECATED
+#include <string.h>
 
 #include "gtkimcontext.h"
 #include "gtkmain.h"		/* For _gtk_boolean_handled_accumulator */
 #include "gtkmarshalers.h"
-#include "gtksignal.h"
-#include "string.h"
 
 enum {
   PREEDIT_START,
@@ -54,10 +52,10 @@ static void     gtk_im_context_real_set_surrounding    (GtkIMContext   *context,
 							gint            len,
 							gint            cursor_index);
 
-GtkType
+GType
 gtk_im_context_get_type (void)
 {
-  static GtkType im_context_type = 0;
+  static GType im_context_type = 0;
 
   if (!im_context_type)
     {
@@ -67,16 +65,17 @@ gtk_im_context_get_type (void)
         (GBaseInitFunc) NULL,
         (GBaseFinalizeFunc) NULL,
         (GClassInitFunc) gtk_im_context_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
+        NULL,		/* class_finalize */
+        NULL,		/* class_data */
         sizeof (GtkIMContext),
-        0,              /* n_preallocs */
+        0,		/* n_preallocs */
         (GInstanceInitFunc) gtk_im_context_init,
-        NULL            /* value_table */
+        NULL,		/* value_table */
       };
       
-      im_context_type = g_type_register_static (G_TYPE_OBJECT, "GtkIMContext",
-						&im_context_info, G_TYPE_FLAG_ABSTRACT);
+      im_context_type =
+	g_type_register_static (G_TYPE_OBJECT, "GtkIMContext",
+				&im_context_info, G_TYPE_FLAG_ABSTRACT);
     }
 
   return im_context_type;
@@ -85,10 +84,6 @@ gtk_im_context_get_type (void)
 static void
 gtk_im_context_class_init (GtkIMContextClass *klass)
 {
-  GtkObjectClass *object_class;
-  
-  object_class = (GtkObjectClass*) klass;
-
   klass->get_preedit_string = gtk_im_context_real_get_preedit_string;
   klass->filter_keypress = gtk_im_context_real_filter_keypress;
   klass->get_surrounding = gtk_im_context_real_get_surrounding;
@@ -96,7 +91,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
 
   im_context_signals[PREEDIT_START] =
     g_signal_new ("preedit_start",
-		  G_TYPE_FROM_CLASS (object_class),
+		  G_TYPE_FROM_CLASS (klass),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkIMContextClass, preedit_start),
 		  NULL, NULL,
@@ -105,7 +100,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
   
   im_context_signals[PREEDIT_END] =
     g_signal_new ("preedit_end",
-		  G_TYPE_FROM_CLASS (object_class),
+		  G_TYPE_FROM_CLASS (klass),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkIMContextClass, preedit_end),
 		  NULL, NULL,
@@ -114,7 +109,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
   
   im_context_signals[PREEDIT_CHANGED] =
     g_signal_new ("preedit_changed",
-		  G_TYPE_FROM_CLASS (object_class),
+		  G_TYPE_FROM_CLASS (klass),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkIMContextClass, preedit_changed),
 		  NULL, NULL,
@@ -123,7 +118,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
   
   im_context_signals[COMMIT] =
     g_signal_new ("commit",
-		  G_TYPE_FROM_CLASS (object_class),
+		  G_TYPE_FROM_CLASS (klass),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkIMContextClass, commit),
 		  NULL, NULL,
@@ -133,7 +128,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
 
   im_context_signals[RETRIEVE_SURROUNDING] =
     g_signal_new ("retrieve_surrounding",
-                  G_TYPE_FROM_CLASS (object_class),
+                  G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkIMContextClass, retrieve_surrounding),
                   _gtk_boolean_handled_accumulator, NULL,
@@ -141,7 +136,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                   G_TYPE_BOOLEAN, 0);
   im_context_signals[DELETE_SURROUNDING] =
     g_signal_new ("delete_surrounding",
-                  G_TYPE_FROM_CLASS (object_class),
+                  G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkIMContextClass, delete_surrounding),
                   _gtk_boolean_handled_accumulator, NULL,
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index a3ebea0263..4ca114bcbf 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -30,11 +30,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GTK_TYPE_IM_CONTEXT              (gtk_im_context_get_type ())
-#define GTK_IM_CONTEXT(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
-#define GTK_IM_CONTEXT_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
-#define GTK_IS_IM_CONTEXT(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
-#define GTK_IS_IM_CONTEXT_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
-#define GTK_IM_CONTEXT_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
+#define GTK_IM_CONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
+#define GTK_IM_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
+#define GTK_IS_IM_CONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
+#define GTK_IS_IM_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
+#define GTK_IM_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
 
 
 typedef struct _GtkIMContext       GtkIMContext;
@@ -47,6 +47,9 @@ struct _GtkIMContext
 
 struct _GtkIMContextClass
 {
+  /* Yes, this should be GObjectClass, be we can't fix it without breaking
+   * binary compatibility - see bug #90935
+   */
   GtkObjectClass parent_class;
 
   /* Signals */
@@ -92,7 +95,7 @@ struct _GtkIMContextClass
   void (*_gtk_reserved6) (void);
 };
 
-GtkType       gtk_im_context_get_type           (void) G_GNUC_CONST;
+GType    gtk_im_context_get_type            (void) G_GNUC_CONST;
 
 void     gtk_im_context_set_client_window   (GtkIMContext   *context,
 					     GdkWindow      *window);
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 1a1771b62e..e88c3f282a 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -21,7 +21,6 @@
 
 #include <gdk/gdkkeysyms.h>
 #include "gtkaccelgroup.h"
-#include "gtksignal.h"
 #include "gtkimcontextsimple.h"
 
 typedef struct _GtkComposeTable GtkComposeTable;
@@ -864,10 +863,10 @@ static void     gtk_im_context_simple_get_preedit_string (GtkIMContext
 
 static GObjectClass *parent_class;
 
-GtkType
+GType
 gtk_im_context_simple_get_type (void)
 {
-  static GtkType im_context_simple_type = 0;
+  static GType im_context_simple_type = 0;
 
   if (!im_context_simple_type)
     {
@@ -884,9 +883,9 @@ gtk_im_context_simple_get_type (void)
         (GInstanceInitFunc) gtk_im_context_simple_init,
       };
       
-      im_context_simple_type = g_type_register_static (GTK_TYPE_IM_CONTEXT,
-						       "GtkIMContextSimple",
-						       &im_context_simple_info, 0);
+      im_context_simple_type =
+	g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMContextSimple",
+				&im_context_simple_info, 0);
     }
 
   return im_context_simple_type;
@@ -937,7 +936,7 @@ gtk_im_context_simple_finalize (GObject *obj)
 GtkIMContext *
 gtk_im_context_simple_new (void)
 {
-  return GTK_IM_CONTEXT (g_object_new (GTK_TYPE_IM_CONTEXT_SIMPLE, NULL));
+  return g_object_new (GTK_TYPE_IM_CONTEXT_SIMPLE, NULL);
 }
 
 static void
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index af563d67af..58f1b95077 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -28,11 +28,11 @@ extern "C" {
 
 
 #define GTK_TYPE_IM_CONTEXT_SIMPLE              (gtk_im_context_simple_get_type ())
-#define GTK_IM_CONTEXT_SIMPLE(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimple))
-#define GTK_IM_CONTEXT_SIMPLE_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
-#define GTK_IS_IM_CONTEXT_SIMPLE(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE))
-#define GTK_IS_IM_CONTEXT_SIMPLE_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE))
-#define GTK_IM_CONTEXT_SIMPLE_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
+#define GTK_IM_CONTEXT_SIMPLE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimple))
+#define GTK_IM_CONTEXT_SIMPLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
+#define GTK_IS_IM_CONTEXT_SIMPLE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE))
+#define GTK_IS_IM_CONTEXT_SIMPLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT_SIMPLE))
+#define GTK_IM_CONTEXT_SIMPLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT_SIMPLE, GtkIMContextSimpleClass))
 
 
 typedef struct _GtkIMContextSimple       GtkIMContextSimple;
@@ -58,7 +58,7 @@ struct _GtkIMContextSimpleClass
   GtkIMContextClass parent_class;
 };
 
-GtkType       gtk_im_context_simple_get_type (void) G_GNUC_CONST;
+GType         gtk_im_context_simple_get_type  (void) G_GNUC_CONST;
 GtkIMContext *gtk_im_context_simple_new       (void);
 
 void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 571ee906f8..6d5a9176c4 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -179,7 +179,9 @@ gtk_im_module_get_type (void)
         NULL,           /* instance_init */
       };
 
-      im_module_type = g_type_register_static (G_TYPE_TYPE_MODULE, "GtkIMModule", &im_module_info, 0);
+      im_module_type =
+	g_type_register_static (G_TYPE_TYPE_MODULE, "GtkIMModule",
+				&im_module_info, 0);
     }
   
   return im_module_type;
@@ -375,7 +377,7 @@ gtk_im_module_init ()
 	}
       g_slist_free (infos);
 
-      g_object_unref (G_OBJECT (module));
+      g_object_unref (module);
     }
   else if (module)
     add_module (module, infos);
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 196802c103..a5ad0d8bda 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <locale.h>
 
-#include "gtksignal.h"
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
 #include "gtkradiomenuitem.h"
@@ -75,10 +74,10 @@ static GtkIMContextClass *parent_class;
 
 static const gchar *global_context_id = NULL;
 
-GtkType
+GType
 gtk_im_multicontext_get_type (void)
 {
-  static GtkType im_multicontext_type = 0;
+  static GType im_multicontext_type = 0;
  
   if (!im_multicontext_type)
     {
@@ -95,9 +94,9 @@ gtk_im_multicontext_get_type (void)
         (GInstanceInitFunc) gtk_im_multicontext_init,
       };
       
-      im_multicontext_type = g_type_register_static (GTK_TYPE_IM_CONTEXT,
-						     "GtkIMMulticontext",
-						     &im_multicontext_info, 0);
+      im_multicontext_type =
+	g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMMulticontext",
+				&im_multicontext_info, 0);
     }
 
   return im_multicontext_type;
@@ -141,7 +140,7 @@ gtk_im_multicontext_init (GtkIMMulticontext *multicontext)
 GtkIMContext *
 gtk_im_multicontext_new (void)
 {
-  return GTK_IM_CONTEXT (g_object_new (GTK_TYPE_IM_MULTICONTEXT, NULL));
+  return g_object_new (GTK_TYPE_IM_MULTICONTEXT, NULL);
 }
 
 static void
@@ -165,16 +164,16 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
 	gtk_im_context_reset (multicontext->slave);
       
       g_signal_handlers_disconnect_by_func (multicontext->slave,
-					    (gpointer) gtk_im_multicontext_preedit_start_cb,
+					    gtk_im_multicontext_preedit_start_cb,
 					    multicontext);
       g_signal_handlers_disconnect_by_func (multicontext->slave,
-					    (gpointer) gtk_im_multicontext_preedit_end_cb,
+					    gtk_im_multicontext_preedit_end_cb,
 					    multicontext);
       g_signal_handlers_disconnect_by_func (multicontext->slave,
-					    (gpointer) gtk_im_multicontext_preedit_changed_cb,
+					    gtk_im_multicontext_preedit_changed_cb,
 					    multicontext);
       g_signal_handlers_disconnect_by_func (multicontext->slave,
-					    (gpointer) gtk_im_multicontext_commit_cb,
+					    gtk_im_multicontext_commit_cb,
 					    multicontext);
 
       g_object_unref (multicontext->slave);
@@ -448,7 +447,7 @@ activate_cb (GtkWidget         *menuitem,
 {
   if (GTK_CHECK_MENU_ITEM (menuitem)->active)
     {
-      const gchar *id = gtk_object_get_data (GTK_OBJECT (menuitem), "gtk-context-id");
+      const gchar *id = g_object_get_data (G_OBJECT (menuitem), "gtk-context-id");
 
       gtk_im_context_reset (GTK_IM_CONTEXT (context));
       
@@ -489,12 +488,12 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
         gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
                                         TRUE);
       
-      group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
+      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
       
-      gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-context-id",
-			   (char *)contexts[i]->context_id);
-      gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			  G_CALLBACK (activate_cb), context);
+      g_object_set_data (G_OBJECT (menuitem), "gtk-context-id",
+			 (char *)contexts[i]->context_id);
+      g_signal_connect (menuitem, "activate",
+			G_CALLBACK (activate_cb), context);
 
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (menushell, menuitem);
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index b20d0e56e6..18d2cbe9f6 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -29,11 +29,11 @@ extern "C" {
 
 
 #define GTK_TYPE_IM_MULTICONTEXT              (gtk_im_multicontext_get_type ())
-#define GTK_IM_MULTICONTEXT(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
-#define GTK_IM_MULTICONTEXT_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
-#define GTK_IS_IM_MULTICONTEXT(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IS_IM_MULTICONTEXT_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
-#define GTK_IM_MULTICONTEXT_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
+#define GTK_IM_MULTICONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
+#define GTK_IM_MULTICONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
+#define GTK_IS_IM_MULTICONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
+#define GTK_IS_IM_MULTICONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
+#define GTK_IM_MULTICONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
 
 
 typedef struct _GtkIMMulticontext       GtkIMMulticontext;
@@ -61,7 +61,7 @@ struct _GtkIMMulticontextClass
   void (*_gtk_reserved4) (void);
 };
 
-GtkType       gtk_im_multicontext_get_type (void) G_GNUC_CONST;
+GType         gtk_im_multicontext_get_type (void) G_GNUC_CONST;
 GtkIMContext *gtk_im_multicontext_new      (void);
 
 void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 37e4835758..4b9441c080 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -17,12 +17,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <string.h>
+#include <gobject/gvaluecollector.h>
 #include "gtktreemodel.h"
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
-#include <string.h>
-#include <gobject/gvaluecollector.h>
 
 #define G_NODE(node) ((GNode *)node)
 #define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != -2)
@@ -126,7 +126,7 @@ validate_tree (GtkTreeStore *tree_store)
     }
 }
 
-GtkType
+GType
 gtk_tree_store_get_type (void)
 {
   static GType tree_store_type = 0;
@@ -174,7 +174,8 @@ gtk_tree_store_get_type (void)
 	NULL
       };
 
-      tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore", &tree_store_info, 0);
+      tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore",
+						&tree_store_info, 0);
 
       g_type_add_interface_static (tree_store_type,
 				   GTK_TYPE_TREE_MODEL,
@@ -285,7 +286,7 @@ gtk_tree_store_new (gint n_columns,
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
-  retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+  retval = g_object_new (GTK_TYPE_TREE_STORE, NULL);
   gtk_tree_store_set_n_columns (retval, n_columns);
 
   va_start (args, n_columns);
@@ -295,8 +296,9 @@ gtk_tree_store_new (gint n_columns,
       GType type = va_arg (args, GType);
       if (! _gtk_tree_data_list_check_type (type))
 	{
-	  g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (type));
-	  g_object_unref (G_OBJECT (retval));
+	  g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n",
+		     G_STRLOC, g_type_name (type));
+	  g_object_unref (retval);
 	  return NULL;
 	}
       gtk_tree_store_set_column_type (retval, i, type);
@@ -323,15 +325,16 @@ gtk_tree_store_newv (gint   n_columns,
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
-  retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+  retval = g_object_new (GTK_TYPE_TREE_STORE, NULL);
   gtk_tree_store_set_n_columns (retval, n_columns);
 
    for (i = 0; i < n_columns; i++)
     {
       if (! _gtk_tree_data_list_check_type (types[i]))
 	{
-	  g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (types[i]));
-	  g_object_unref (G_OBJECT (retval));
+	  g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n",
+		     G_STRLOC, g_type_name (types[i]));
+	  g_object_unref (retval);
 	  return NULL;
 	}
       gtk_tree_store_set_column_type (retval, i, types[i]);
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 85f3c58b34..988e7f034f 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -29,11 +29,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define GTK_TYPE_TREE_STORE			(gtk_tree_store_get_type ())
-#define GTK_TREE_STORE(obj)			(GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_STORE, GtkTreeStore))
-#define GTK_TREE_STORE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
-#define GTK_IS_TREE_STORE(obj)			(GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_STORE))
-#define GTK_IS_TREE_STORE_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_STORE))
-#define GTK_TREE_STORE_GET_CLASS(obj)           (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
+#define GTK_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_STORE, GtkTreeStore))
+#define GTK_TREE_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
+#define GTK_IS_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_STORE))
+#define GTK_IS_TREE_STORE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_STORE))
+#define GTK_TREE_STORE_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
 
 typedef struct _GtkTreeStore       GtkTreeStore;
 typedef struct _GtkTreeStoreClass  GtkTreeStoreClass;
@@ -68,7 +68,7 @@ struct _GtkTreeStoreClass
 };
 
 
-GtkType       gtk_tree_store_get_type         (void);
+GType         gtk_tree_store_get_type         (void);
 GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
 					       ...);
 GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,