From 04af158605b23034b2911da6dfed8ce7c776bd90 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 22 May 2001 20:30:48 +0000 Subject: Added patch from Jeff Franks to add GET_CLASS macros to Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: * gtk/gtkcell*.h: * gtk/gtk*store.h: Added patch from Jeff Franks to add GET_CLASS macros to all objects. --- gtk/gtkcellrendererpixbuf.h | 1 + gtk/gtkcellrenderertext.h | 1 + gtk/gtkcellrenderertextpixbuf.h | 1 + gtk/gtkcellrenderertoggle.h | 1 + gtk/gtkliststore.h | 1 + gtk/gtktreemodelsort.h | 3 ++- gtk/gtktreeselection.h | 1 + gtk/gtktreestore.h | 1 + gtk/gtktreeview.h | 1 + gtk/gtktreeviewcolumn.c | 1 - gtk/gtktreeviewcolumn.h | 2 +- 11 files changed, 11 insertions(+), 3 deletions(-) (limited to 'gtk') diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h index 14fd9b5799..ccea90943c 100644 --- a/gtk/gtkcellrendererpixbuf.h +++ b/gtk/gtkcellrendererpixbuf.h @@ -32,6 +32,7 @@ extern "C" { #define GTK_CELL_RENDERER_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass)) #define GTK_IS_CELL_RENDERER_PIXBUF(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF)) #define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF)) +#define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass)) typedef struct _GtkCellRendererPixbuf GtkCellRendererPixbuf; typedef struct _GtkCellRendererPixbufClass GtkCellRendererPixbufClass; diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h index 4ac2bd232a..58068ed9a2 100644 --- a/gtk/gtkcellrenderertext.h +++ b/gtk/gtkcellrenderertext.h @@ -33,6 +33,7 @@ extern "C" { #define GTK_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass)) #define GTK_IS_CELL_RENDERER_TEXT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT)) #define GTK_IS_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT)) +#define GTK_CELL_RENDERER_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass)) typedef struct _GtkCellRendererText GtkCellRendererText; typedef struct _GtkCellRendererTextClass GtkCellRendererTextClass; diff --git a/gtk/gtkcellrenderertextpixbuf.h b/gtk/gtkcellrenderertextpixbuf.h index fa372b4475..d739a53612 100644 --- a/gtk/gtkcellrenderertextpixbuf.h +++ b/gtk/gtkcellrenderertextpixbuf.h @@ -32,6 +32,7 @@ extern "C" { #define GTK_CELL_RENDERER_TEXT_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF, GtkCellRendererTextPixbufClass)) #define GTK_IS_CELL_RENDERER_TEXT_PIXBUF(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF)) #define GTK_IS_CELL_RENDERER_TEXT_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF)) +#define GTK_CELL_RENDERER_TEXT_PIXBUF_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF, GtkCellRendererTextPixbufClass)) typedef struct _GtkCellRendererTextPixbuf GtkCellRendererTextPixbuf; typedef struct _GtkCellRendererTextPixbufClass GtkCellRendererTextPixbufClass; diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h index b48470bc92..094258b7d6 100644 --- a/gtk/gtkcellrenderertoggle.h +++ b/gtk/gtkcellrenderertoggle.h @@ -32,6 +32,7 @@ extern "C" { #define GTK_CELL_RENDERER_TOGGLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass)) #define GTK_IS_CELL_RENDERER_TOGGLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE)) #define GTK_IS_CELL_RENDERER_TOGGLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE)) +#define GTK_CELL_RENDERER_TOGGLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass)) typedef struct _GtkCellRendererToggle GtkCellRendererToggle; typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass; diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h index 13eb37a61c..61c806d93b 100644 --- a/gtk/gtkliststore.h +++ b/gtk/gtkliststore.h @@ -32,6 +32,7 @@ extern "C" { #define GTK_LIST_STORE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LISTSTORE, GtkListStoreClass)) #define GTK_IS_LIST_STORE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST_STORE)) #define GTK_IS_LIST_STORE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_LIST_STORE)) +#define GTK_LIST_STORE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass)) typedef struct _GtkListStore GtkListStore; typedef struct _GtkListStoreClass GtkListStoreClass; diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h index ef0518305c..192e030d30 100644 --- a/gtk/gtktreemodelsort.h +++ b/gtk/gtktreemodelsort.h @@ -31,6 +31,7 @@ extern "C" { #define GTK_TREE_MODEL_SORT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass)) #define GTK_IS_TREE_MODEL_SORT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT)) #define GTK_IS_TREE_MODEL_SORT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT)) +#define GTK_TREE_MODEL_SORT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass)) typedef struct _GtkTreeModelSort GtkTreeModelSort; typedef struct _GtkTreeModelSortClass GtkTreeModelSortClass; @@ -73,7 +74,7 @@ GtkTreeModel *gtk_tree_model_sort_get_model (GtkTreeModelSort *tree_model) GtkTreePath *gtk_tree_model_sort_convert_path (GtkTreeModelSort *tree_model_sort, GtkTreePath *child_path); -/* not implemented */ +/* FIXME: not implemented yet */ void gtk_tree_model_sort_convert_iter (GtkTreeModelSort *tree_model_sort, GtkTreeIter *sort_iter, GtkTreeIter *child_iter); diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h index aaafa5057d..104cb73dfa 100644 --- a/gtk/gtktreeselection.h +++ b/gtk/gtktreeselection.h @@ -32,6 +32,7 @@ extern "C" { #define GTK_TREE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass)) #define GTK_IS_TREE_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_SELECTION)) #define GTK_IS_TREE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_SELECTION)) +#define GTK_TREE_SELECTION_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass)) typedef enum { diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index 0240597019..76c6ff63fc 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -33,6 +33,7 @@ extern "C" { #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 ((obj), GTK_TYPE_TREE_STORE)) +#define GTK_TREE_STORE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass)) typedef struct _GtkTreeStore GtkTreeStore; typedef struct _GtkTreeStoreClass GtkTreeStoreClass; diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index 4a63b9a053..432e8e2f09 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -45,6 +45,7 @@ typedef enum #define GTK_TREE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW, GtkTreeViewClass)) #define GTK_IS_TREE_VIEW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_VIEW)) #define GTK_IS_TREE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_VIEW)) +#define GTK_TREE_VIEW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW, GtkTreeViewClass)) typedef struct _GtkTreeView GtkTreeView; typedef struct _GtkTreeViewClass GtkTreeViewClass; diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index cbfac183b5..824f1c19c9 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -296,7 +296,6 @@ gtk_tree_view_column_init (GtkTreeViewColumn *tree_column) tree_column->property_changed_signal = 0; tree_column->sort_clicked_signal = 0; tree_column->sort_column_changed_signal = 0; - tree_column->clickable_signal = 0; tree_column->sort_column_id = -1; tree_column->reorderable = FALSE; tree_column->maybe_reordered = FALSE; diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 394e2aedec..2ee09b77db 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -34,6 +34,7 @@ extern "C" { #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 ((obj), GTK_TYPE_TREE_VIEW_COLUMN)) +#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass)) typedef enum { @@ -64,7 +65,6 @@ struct _GtkTreeViewColumn GdkWindow *window; gfloat xalign; guint property_changed_signal; - guint clickable_signal; gint width; gint requested_width; -- cgit v1.2.1