summaryrefslogtreecommitdiff
path: root/gtk/gtktreeviewcolumn.h
diff options
context:
space:
mode:
authorManish Singh <yosh@gimp.org>2002-10-13 19:34:42 +0000
committerManish Singh <yosh@src.gnome.org>2002-10-13 19:34:42 +0000
commitc77265d3a7326bbe184c14bd85eed17712905e31 (patch)
tree3e746af88994e12cdfea51ff8a643f41e54b1ec8 /gtk/gtktreeviewcolumn.h
parentfb716863df14ce63362d1251f89c595dbe153168 (diff)
downloadgtk+-c77265d3a7326bbe184c14bd85eed17712905e31.tar.gz
Deprecation cleanup
Sun Oct 13 12:29:15 2002 Manish Singh <yosh@gimp.org> * gtk/gtkcolorsel.[ch] gtk/gtkcombo.[ch] gtk/gtkplug.[ch] gtk/gtksocket.[ch] gtk/gtktreeview.[ch] gtk/gtktreeviewcolumn.[ch]: Deprecation cleanup * gtk/gtkcolorseldialog.c: make window not resizable (lost accidently in the previous cleanup)
Diffstat (limited to 'gtk/gtktreeviewcolumn.h')
-rw-r--r--gtk/gtktreeviewcolumn.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 22d20ef704..863202279d 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -20,21 +20,24 @@
#ifndef __GTK_TREE_VIEW_COLUMN_H__
#define __GTK_TREE_VIEW_COLUMN_H__
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
+/* Not needed, retained for compatibility -Yosh */
+#include <gtk/gtkobject.h>
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_TREE_VIEW_COLUMN (gtk_tree_view_column_get_type ())
-#define GTK_TREE_VIEW_COLUMN(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
-#define GTK_TREE_VIEW_COLUMN_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
-#define GTK_IS_TREE_VIEW_COLUMN(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
+#define GTK_TREE_VIEW_COLUMN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
+#define GTK_TREE_VIEW_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
+#define GTK_IS_TREE_VIEW_COLUMN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
+#define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW_COLUMN))
+#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
typedef enum
{
@@ -116,7 +119,7 @@ struct _GtkTreeViewColumnClass
void (*_gtk_reserved4) (void);
};
-GtkType gtk_tree_view_column_get_type (void);
+GType gtk_tree_view_column_get_type (void);
GtkTreeViewColumn *gtk_tree_view_column_new (void);
GtkTreeViewColumn *gtk_tree_view_column_new_with_attributes (const gchar *title,
GtkCellRenderer *cell,