From: Jonathan Blandford Date: Fri, 23 Mar 2001 21:12:33 +0000 (+0000) Subject: Forgot to namespace this. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=b572436d359e2e6ad5549e532f31acdfe0b0389e;p=~andy%2Fgtk Forgot to namespace this. Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace this. * gtk/gtktreestore.c (gtk_tree_store_set_value): change from set_cell to set_value * gtk/gtkliststore.c (gtk_list_store_set_value): change from set_cell to set_value --- diff --git a/ChangeLog b/ChangeLog index 57ec76369..3580ad38d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 57ec76369..3580ad38d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 57ec76369..3580ad38d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 57ec76369..3580ad38d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 57ec76369..3580ad38d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 57ec76369..3580ad38d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 57ec76369..3580ad38d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Fri Mar 23 16:13:43 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace + this. + + * gtk/gtktreestore.c (gtk_tree_store_set_value): change from + set_cell to set_value + + * gtk/gtkliststore.c (gtk_list_store_set_value): change from + set_cell to set_value + Thu Mar 22 19:27:34 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 92de43a1a..e3153e52e 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -225,6 +225,7 @@ gtk_list_store_init (GtkListStore *list_store) list_store->sort_list = NULL; list_store->stamp = g_random_int (); list_store->length = 0; + list_store->sort_column_id = -1; } /** @@ -563,7 +564,7 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model, */ /** - * gtk_list_store_set_cell: + * gtk_list_store_set_value: * @store: a #GtkListStore * @iter: iterator for the row you're modifying * @column: column number to modify @@ -575,10 +576,10 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model, * **/ void -gtk_list_store_set_cell (GtkListStore *list_store, - GtkTreeIter *iter, - gint column, - GValue *value) +gtk_list_store_set_value (GtkListStore *list_store, + GtkTreeIter *iter, + gint column, + GValue *value) { GtkTreeDataList *list; GtkTreeDataList *prev; @@ -713,10 +714,10 @@ gtk_list_store_set_valist (GtkListStore *list_store, break; } - gtk_list_store_set_cell (list_store, - iter, - column, - &value); + gtk_list_store_set_value (list_store, + iter, + column, + &value); g_value_unset (&value); diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h index 5ab9a8d14..13eb37a61 100644 --- a/gtk/gtkliststore.h +++ b/gtk/gtkliststore.h @@ -55,20 +55,6 @@ struct _GtkListStore struct _GtkListStoreClass { GObjectClass parent_class; - - /* signals */ - /* Will be moved into the GtkTreeModelIface eventually */ - void (* changed) (GtkTreeModel *tree_model, - GtkTreePath *path, - GtkTreeIter *iter); - void (* inserted) (GtkTreeModel *tree_model, - GtkTreePath *path, - GtkTreeIter *iter); - void (* has_child_toggled) (GtkTreeModel *tree_model, - GtkTreePath *path, - GtkTreeIter *iter); - void (* deleted) (GtkTreeModel *tree_model, - GtkTreePath *path); }; @@ -81,7 +67,7 @@ void gtk_list_store_set_n_columns (GtkListStore *store, void gtk_list_store_set_column_type (GtkListStore *store, gint column, GType type); -void gtk_list_store_set_cell (GtkListStore *store, +void gtk_list_store_set_value (GtkListStore *store, GtkTreeIter *iter, gint column, GValue *value); diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index a4cba08a8..7ae33b88a 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -597,10 +597,10 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model, * manipulations on it's own. */ void -gtk_tree_store_set_cell (GtkTreeStore *tree_store, - GtkTreeIter *iter, - gint column, - GValue *value) +gtk_tree_store_set_value (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gint column, + GValue *value) { GtkTreeDataList *list; GtkTreeDataList *prev; @@ -733,10 +733,10 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store, break; } - gtk_tree_store_set_cell (tree_store, - iter, - column, - &value); + gtk_tree_store_set_value (tree_store, + iter, + column, + &value); g_value_unset (&value); diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index d38ca5a55..6076cdbf5 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -64,7 +64,7 @@ void gtk_tree_store_set_n_columns (GtkTreeStore *tree_store, void gtk_tree_store_set_column_type (GtkTreeStore *store, gint column, GType type); -void gtk_tree_store_set_cell (GtkTreeStore *tree_store, +void gtk_tree_store_set_value (GtkTreeStore *tree_store, GtkTreeIter *iter, gint column, GValue *value); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index e7347ce07..528035c16 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -778,7 +778,7 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column, **/ void gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn *tree_column, - CellDataFunc func, + GtkCellDataFunc func, gpointer func_data, GtkDestroyNotify destroy) { diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 5de559147..36677c2da 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -45,11 +45,11 @@ typedef enum typedef struct _GtkTreeViewColumn GtkTreeViewColumn; typedef struct _GtkTreeViewColumnClass GtkTreeViewColumnClass; -typedef void (* CellDataFunc) (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data); +typedef void (* GtkCellDataFunc) (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data); struct _GtkTreeViewColumn @@ -71,7 +71,7 @@ struct _GtkTreeViewColumn gint max_width; gint displayed_width; - CellDataFunc func; + GtkCellDataFunc func; gpointer func_data; GtkDestroyNotify destroy; gchar *title; @@ -107,7 +107,7 @@ void gtk_tree_view_column_add_attribute (GtkTreeViewColumn void gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column, ...); void gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn *tree_column, - CellDataFunc func, + GtkCellDataFunc func, gpointer func_data, GtkDestroyNotify destroy); void gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column);