:get_property): remove g_value_init calls, as they are no longer needed.

2000-12-20  Jonathan Blandford  <jrb@redhat.com>

	    * gtk/gtkcellrenderer*.c (::get_property): remove
              g_value_init
	      calls, as they are no longer needed.

	      * gtk/gtktreemodelsort.c: Fix up the comparison code.

	      * gtk/gtktreemodel.h: Start work on ::reordered signal.
	      Need to
	      figure out how to emit a signal on an interface.
This commit is contained in:
Jonathan Blandford
2000-12-21 05:27:06 +00:00
committed by Jonathan Blandford
parent f00175cf07
commit dadf966b3b
16 changed files with 112 additions and 37 deletions

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -1,3 +1,13 @@
2000-12-20 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
calls, as they are no longer needed.
* gtk/gtktreemodelsort.c: Fix up the comparison code.
* gtk/gtktreemodel.h: Start work on ::reordered signal. Need to
figure out how to emit a signal on an interface.
2000-12-20 Havoc Pennington <hp@redhat.com> 2000-12-20 Havoc Pennington <hp@redhat.com>
* tests: new directory to contain tests, gtk/test* should move * tests: new directory to contain tests, gtk/test* should move

View File

@ -121,7 +121,6 @@ gtk_cell_renderer_pixbuf_get_property (GObject *object,
switch (param_id) switch (param_id)
{ {
case PROP_PIXBUF: case PROP_PIXBUF:
g_value_init (value, G_TYPE_OBJECT);
g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf)); g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf));
break; break;
default: default:

View File

@ -205,22 +205,18 @@ gtk_cell_renderer_text_get_property (GObject *object,
switch (param_id) switch (param_id)
{ {
case PROP_TEXT: case PROP_TEXT:
g_value_init (value, G_TYPE_STRING);
g_value_set_string (value, celltext->text); g_value_set_string (value, celltext->text);
break; break;
case PROP_STRIKETHROUGH: case PROP_STRIKETHROUGH:
g_value_init (value, G_TYPE_BOOLEAN);
attr_iter = pango_attr_list_get_iterator (celltext->attr_list); attr_iter = pango_attr_list_get_iterator (celltext->attr_list);
attr = pango_attr_iterator_get (attr_iter, attr = pango_attr_iterator_get (attr_iter,
PANGO_ATTR_STRIKETHROUGH); PANGO_ATTR_STRIKETHROUGH);
g_value_set_boolean (value, ((PangoAttrInt*) attr)->value); g_value_set_boolean (value, ((PangoAttrInt*) attr)->value);
break; break;
case PROP_UNDERLINE: case PROP_UNDERLINE:
g_value_init (value, G_TYPE_BOOLEAN);
g_value_set_boolean (value, celltext->underline); g_value_set_boolean (value, celltext->underline);
break; break;
case PROP_EDITABLE: case PROP_EDITABLE:
g_value_init (value, G_TYPE_BOOLEAN);
g_value_set_boolean (value, celltext->editable); g_value_set_boolean (value, celltext->editable);
break; break;
default: default:

View File

@ -164,11 +164,9 @@ gtk_cell_renderer_toggle_get_property (GObject *object,
switch (param_id) switch (param_id)
{ {
case PROP_STATE: case PROP_STATE:
g_value_init (value, G_TYPE_BOOLEAN);
g_value_set_boolean (value, celltoggle->state); g_value_set_boolean (value, celltoggle->state);
break; break;
case PROP_RADIO: case PROP_RADIO:
g_value_init (value, G_TYPE_BOOLEAN);
g_value_set_boolean (value, celltoggle->radio); g_value_set_boolean (value, celltoggle->radio);
break; break;
default: default:

View File

@ -40,6 +40,12 @@ gtk_tree_model_get_type (void)
sizeof (GtkTreeModelIface), /* class_size */ sizeof (GtkTreeModelIface), /* class_size */
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
NULL,
NULL, /* class_finalize */
NULL, /* class_data */
0,
0, /* n_preallocs */
NULL
}; };
tree_model_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeModel", &tree_model_info, 0); tree_model_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeModel", &tree_model_info, 0);

View File

@ -71,6 +71,9 @@ struct _GtkTreeModelIface
GtkTreeIter *iter); GtkTreeIter *iter);
void (* deleted) (GtkTreeModel *tree_model, void (* deleted) (GtkTreeModel *tree_model,
GtkTreePath *path); GtkTreePath *path);
void (* reordered) (GtkTreeModel *tree_model,
GtkTreePath *path,
gint *new_order);
/* VTable - not signals */ /* VTable - not signals */
guint (* get_flags) (GtkTreeModel *tree_model); guint (* get_flags) (GtkTreeModel *tree_model);

View File

@ -419,10 +419,7 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *sort,
GtkTreeIter iter; GtkTreeIter iter;
SortElt elt; SortElt elt;
gint offset; gint offset;
gint middle, j; gint j;
GValueCompareFunc func;
GValue s_value = {0, };
GValue tmp_value = {0, };
SortElt *tmp_elt; SortElt *tmp_elt;
offset = gtk_tree_path_get_indices (s_path)[gtk_tree_path_get_depth (s_path) - 1]; offset = gtk_tree_path_get_indices (s_path)[gtk_tree_path_get_depth (s_path) - 1];
@ -466,8 +463,6 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *sort,
g_array_insert_vals (array, index, &elt, 1); g_array_insert_vals (array, index, &elt, 1);
g_value_unset (&s_value);
/* update all the larger offsets */ /* update all the larger offsets */
tmp_elt = (SortElt *) array->data; tmp_elt = (SortElt *) array->data;
for (j = 0; j < array->len; j++, tmp_elt++) for (j = 0; j < array->len; j++, tmp_elt++)
@ -1104,8 +1099,8 @@ gtk_tree_model_sort_func (gconstpointer a,
gconstpointer b, gconstpointer b,
gpointer user_data) gpointer user_data)
{ {
GValue value_a; GValue value_a = {0, };
GValue value_b; GValue value_b = {0, };
SortData *sort_data = user_data; SortData *sort_data = user_data;
gint retval; gint retval;

View File

@ -946,7 +946,7 @@ gtk_tree_view_motion (GtkWidget *widget,
gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos), new_width); gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos), new_width);
} }
/* FIXME: We need to scroll */ /* FIXME: Do we need to scroll */
_gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, tree_view->priv->height); _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, tree_view->priv->height);
return FALSE; return FALSE;
} }
@ -1437,7 +1437,7 @@ gtk_tree_view_focus_out (GtkWidget *widget,
} }
/* FIXME: It would be neat to someday make the headers a seperate widget that /* FIXME: It would be neat to someday make the headers a seperate widget that
* can be shared between various apps * can be shared between various apps. Wishful thinking, though...
*/ */
/* Returns TRUE if the focus is within the headers, after the focus operation is /* Returns TRUE if the focus is within the headers, after the focus operation is
* done * done

View File

@ -18,14 +18,18 @@ static void
node_set (GtkTreeIter *iter) node_set (GtkTreeIter *iter)
{ {
static gint i = 0; static gint i = 0;
gint n;
gchar *str; gchar *str;
str = g_strdup_printf ("FOO: %d", i++); str = g_strdup_printf ("Row (%d)", i++);
gtk_tree_store_set (base_model, iter, 0, str, -1); gtk_tree_store_set (base_model, iter, 0, str, -1);
g_free (str); g_free (str);
str = g_strdup_printf ("%d", g_random_int ()); n = g_random_int ();
if (n < 0)
n *= -1;
str = g_strdup_printf ("%d", n);
gtk_tree_store_set (base_model, iter, 1, str, -1); gtk_tree_store_set (base_model, iter, 1, str, -1);
g_free (str); g_free (str);
} }
@ -133,7 +137,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view)
gtk_tree_store_insert_after (model, gtk_tree_store_insert_after (model,
&iter, &iter,
NULL, NULL,
&selected); NULL);
node_set (&iter); node_set (&iter);
} }
} }
@ -303,12 +307,12 @@ make_window (gboolean use_sort)
/* A few to start */ /* A few to start */
if (!use_sort) if (!use_sort)
{ {
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
} }
/* Show it all */ /* Show it all */
gtk_widget_show_all (window); gtk_widget_show_all (window);

View File

@ -18,14 +18,18 @@ static void
node_set (GtkTreeIter *iter) node_set (GtkTreeIter *iter)
{ {
static gint i = 0; static gint i = 0;
gint n;
gchar *str; gchar *str;
str = g_strdup_printf ("FOO: %d", i++); str = g_strdup_printf ("Row (%d)", i++);
gtk_tree_store_set (base_model, iter, 0, str, -1); gtk_tree_store_set (base_model, iter, 0, str, -1);
g_free (str); g_free (str);
str = g_strdup_printf ("%d", g_random_int ()); n = g_random_int ();
if (n < 0)
n *= -1;
str = g_strdup_printf ("%d", n);
gtk_tree_store_set (base_model, iter, 1, str, -1); gtk_tree_store_set (base_model, iter, 1, str, -1);
g_free (str); g_free (str);
} }
@ -133,7 +137,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view)
gtk_tree_store_insert_after (model, gtk_tree_store_insert_after (model,
&iter, &iter,
NULL, NULL,
&selected); NULL);
node_set (&iter); node_set (&iter);
} }
} }
@ -303,12 +307,12 @@ make_window (gboolean use_sort)
/* A few to start */ /* A few to start */
if (!use_sort) if (!use_sort)
{ {
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
iter_prepend (NULL, GTK_TREE_VIEW (tree_view)); iter_append (NULL, GTK_TREE_VIEW (tree_view));
} }
/* Show it all */ /* Show it all */
gtk_widget_show_all (window); gtk_widget_show_all (window);