diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/gtkrbtree.c | 10 | ||||
| -rw-r--r-- | gtk/gtkrbtree.h | 3 |
8 files changed, 35 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu May 16 17:29:08 2002 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG + Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/editable_cells.c (cell_edited): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index deef087a64..df0953a6a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Thu May 16 17:29:08 2002 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG + Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/editable_cells.c (cell_edited): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index deef087a64..df0953a6a7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Thu May 16 17:29:08 2002 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG + Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/editable_cells.c (cell_edited): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index deef087a64..df0953a6a7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Thu May 16 17:29:08 2002 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG + Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/editable_cells.c (cell_edited): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index deef087a64..df0953a6a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Thu May 16 17:29:08 2002 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG + Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/editable_cells.c (cell_edited): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index deef087a64..df0953a6a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Thu May 16 17:29:08 2002 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG + Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/editable_cells.c (cell_edited): Fix diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index 0a426f0557..85daab4ab5 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -482,8 +482,10 @@ _gtk_rbtree_remove (GtkRBTree *tree) gint height = tree->root->offset; +#ifdef G_ENABLE_DEBUG if (gtk_debug_flags & GTK_DEBUG_TREE) _gtk_rbtree_test (G_STRLOC, tree); +#endif tmp_tree = tree->parent_tree; tmp_node = tree->parent_node; @@ -513,8 +515,10 @@ _gtk_rbtree_remove (GtkRBTree *tree) tmp_node = tree->parent_node; _gtk_rbtree_free (tree); +#ifdef G_ENABLE_DEBUG if (gtk_debug_flags & GTK_DEBUG_TREE) _gtk_rbtree_test (G_STRLOC, tmp_tree); +#endif } @@ -733,8 +737,10 @@ _gtk_rbtree_node_set_height (GtkRBTree *tree, tmp_tree = tmp_tree->parent_tree; } } +#ifdef G_ENABLE_DEBUG if (gtk_debug_flags & GTK_DEBUG_TREE) _gtk_rbtree_test (G_STRLOC, tree); +#endif } void @@ -1219,9 +1225,11 @@ _gtk_rbtree_remove_node (GtkRBTree *tree, ; g_return_if_fail (x == tree->root); +#ifdef G_ENABLE_DEBUG if (gtk_debug_flags & GTK_DEBUG_TREE) _gtk_rbtree_test (G_STRLOC, tree); - +#endif + if (node->left == tree->nil || node->right == tree->nil) { y = node; diff --git a/gtk/gtkrbtree.h b/gtk/gtkrbtree.h index c5b4768db6..bf149836dd 100644 --- a/gtk/gtkrbtree.h +++ b/gtk/gtkrbtree.h @@ -171,10 +171,11 @@ void _gtk_rbtree_prev_full (GtkRBTree *tree, gint _gtk_rbtree_get_depth (GtkRBTree *tree); /* This func checks the integrity of the tree */ +#ifdef G_ENABLE_DEBUG void _gtk_rbtree_test (const gchar *where, GtkRBTree *tree); void _gtk_rbtree_debug_spew (GtkRBTree *tree); - +#endif #ifdef __cplusplus } |