summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnu.org>2002-01-02 23:51:03 +0000
committerAnders Carlsson <andersca@src.gnome.org>2002-01-02 23:51:03 +0000
commit88edb0e58ef4dc63ae089f0aeeeff9d7800e52da (patch)
tree545d563f4208227117aeb18fb6b7c2a5f3ed7176
parentbc879373a250a3aa41d64c3b66a33bf8e3d43d10 (diff)
downloadgtk+-88edb0e58ef4dc63ae089f0aeeeff9d7800e52da.tar.gz
Rename gtk_tree_view_queue_draw_node to _gtk_tree_view_queue_draw_node.
2002-01-03 Anders Carlsson <andersca@gnu.org> * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to _gtk_tree_view_queue_draw_node. (gtk_tree_view_row_has_child_toggled): Only redraw one node. * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func): sort_column_id can be 0. * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node): Only redraw one the node being selected. * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLog.pre-2-015
-rw-r--r--ChangeLog.pre-2-1015
-rw-r--r--ChangeLog.pre-2-215
-rw-r--r--ChangeLog.pre-2-415
-rw-r--r--ChangeLog.pre-2-615
-rw-r--r--ChangeLog.pre-2-815
-rw-r--r--gtk/gtktreeprivate.h5
-rw-r--r--gtk/gtktreeselection.c4
-rw-r--r--gtk/gtktreesortable.c2
-rw-r--r--gtk/gtktreeview.c47
11 files changed, 133 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 06afd90dc9..a8dbde1c2d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2002-01-03 Anders Carlsson <andersca@gnu.org>
+
+ * gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
+ _gtk_tree_view_queue_draw_node.
+ (gtk_tree_view_row_has_child_toggled): Only redraw one node.
+
+ * gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
+ sort_column_id can be 0.
+
+ * gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
+ Only redraw one the node being selected.
+
+ * gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
+
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again
+
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 030535e6fa..2c4fc8dc81 100644
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -275,7 +275,10 @@ void _gtk_tree_view_child_move_resize (GtkTreeView *tree_v
gint y,
gint width,
gint height);
-
+void _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
+ GtkRBTree *tree,
+ GtkRBNode *node,
+ GdkRectangle *clip_rect);
void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column);
void _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column);
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 6174fc4789..3d21d3474c 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -1112,8 +1112,8 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
{
node->flags ^= GTK_RBNODE_IS_SELECTED;
- /* FIXME: just draw the one node*/
- gtk_widget_queue_draw (GTK_WIDGET (selection->tree_view));
+ _gtk_tree_view_queue_draw_node (selection->tree_view, tree, node, NULL);
+
return TRUE;
}
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index fe965ad9db..383b9032fc 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -168,7 +168,7 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
g_return_if_fail (iface != NULL);
g_return_if_fail (iface->set_sort_func != NULL);
- g_return_if_fail (sort_column_id > 0);
+ g_return_if_fail (sort_column_id >= 0);
(* iface->set_sort_func) (sortable, sort_column_id, sort_func, user_data, destroy);
}
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 657996c4c0..4b71b5ccaf 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -273,10 +273,6 @@ static void gtk_tree_view_add_move_binding (GtkBindingSet
gint count);
static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view,
GtkRBTree *tree);
-static void gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
- GtkRBTree *tree,
- GtkRBNode *node,
- GdkRectangle *clip_rect);
static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
GtkTreePath *path,
GdkRectangle *clip_rect);
@@ -2497,24 +2493,24 @@ gtk_tree_view_motion_bin_window (GtkWidget *widget,
{
if (old_prelight_node)
{
- gtk_tree_view_queue_draw_node (tree_view,
- old_prelight_tree,
- old_prelight_node,
- NULL);
+ _gtk_tree_view_queue_draw_node (tree_view,
+ old_prelight_tree,
+ old_prelight_node,
+ NULL);
}
if (tree_view->priv->prelight_node)
{
- gtk_tree_view_queue_draw_node (tree_view,
- tree_view->priv->prelight_tree,
- tree_view->priv->prelight_node,
- NULL);
+ _gtk_tree_view_queue_draw_node (tree_view,
+ tree_view->priv->prelight_tree,
+ tree_view->priv->prelight_node,
+ NULL);
}
}
else if (old_arrow_prelit != GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
{
if (tree_view->priv->prelight_node)
{
- gtk_tree_view_queue_draw_node (tree_view,
+ _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node,
NULL);
@@ -3030,7 +3026,7 @@ gtk_tree_view_enter_notify (GtkWidget *widget,
do_prelight (tree_view, tree, node, event->x, event->y);
if (tree_view->priv->prelight_node)
- gtk_tree_view_queue_draw_node (tree_view,
+ _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node,
NULL);
@@ -3052,7 +3048,7 @@ gtk_tree_view_leave_notify (GtkWidget *widget,
tree_view = GTK_TREE_VIEW (widget);
if (tree_view->priv->prelight_node)
- gtk_tree_view_queue_draw_node (tree_view,
+ _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node,
NULL);
@@ -4985,8 +4981,7 @@ gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
}
else
{
- /* FIXME: Just redraw the node */
- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
}
done:
@@ -5860,11 +5855,11 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
}
}
-static void
-gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
- GtkRBTree *tree,
- GtkRBNode *node,
- GdkRectangle *clip_rect)
+void
+_gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
+ GtkRBTree *tree,
+ GtkRBNode *node,
+ GdkRectangle *clip_rect)
{
GdkRectangle rect;
@@ -5902,7 +5897,7 @@ gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
_gtk_tree_view_find_node (tree_view, path, &tree, &node);
if (tree)
- gtk_tree_view_queue_draw_node (tree_view, tree, node, clip_rect);
+ _gtk_tree_view_queue_draw_node (tree_view, tree, node, clip_rect);
}
/* x and y are the mouse position
@@ -6163,7 +6158,7 @@ gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
if (found_column)
{
- gtk_tree_view_queue_draw_node (tree_view,
+ _gtk_tree_view_queue_draw_node (tree_view,
cursor_tree,
cursor_node,
NULL);
@@ -6270,7 +6265,7 @@ gtk_tree_view_real_select_cursor_row (GtkTreeView *tree_view,
gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
- gtk_tree_view_queue_draw_node (tree_view, cursor_tree, cursor_node, NULL);
+ _gtk_tree_view_queue_draw_node (tree_view, cursor_tree, cursor_node, NULL);
gtk_tree_view_row_activated (tree_view, cursor_path, tree_view->priv->focus_column);
gtk_tree_path_free (cursor_path);
@@ -8157,7 +8152,7 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
node, tree, path,
state);
gtk_tree_view_clamp_node_visible (tree_view, tree, node);
- gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
+ _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
}
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[CURSOR_CHANGED], 0);