AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 05:01:09 +00:00
Code Issues Projects Releases Wiki Activity

include missing #ifdef G_ENA\BLE_DEBUG

Browse Source 
Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENA\BLE_DEBUG
This commit is contained in:
Jonathan Blandford 2002-05-16 21:37:49 +00:00 committed by Owen Taylor
parent 3dbc0d63a8
commit 100cde1ce6
8 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/editable_cells.c (cell_edited): Fix * demos/gtk-demo/editable_cells.c (cell_edited): Fix

4
ChangeLog.pre-2-10
View File

@ -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> Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/editable_cells.c (cell_edited): Fix * demos/gtk-demo/editable_cells.c (cell_edited): Fix

4
ChangeLog.pre-2-2
View File

@ -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> Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/editable_cells.c (cell_edited): Fix * demos/gtk-demo/editable_cells.c (cell_edited): Fix

4
ChangeLog.pre-2-4
View File

@ -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> Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/editable_cells.c (cell_edited): Fix * demos/gtk-demo/editable_cells.c (cell_edited): Fix

4
ChangeLog.pre-2-6
View File

@ -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> Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/editable_cells.c (cell_edited): Fix * demos/gtk-demo/editable_cells.c (cell_edited): Fix

4
ChangeLog.pre-2-8
View File

@ -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> Thu May 16 15:44:15 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/editable_cells.c (cell_edited): Fix * demos/gtk-demo/editable_cells.c (cell_edited): Fix

10
gtk/gtkrbtree.c
View File

@ -482,8 +482,10 @@ _gtk_rbtree_remove (GtkRBTree *tree)
gint height = tree->root->offset; gint height = tree->root->offset;
#ifdef G_ENABLE_DEBUG
if (gtk_debug_flags & GTK_DEBUG_TREE) if (gtk_debug_flags & GTK_DEBUG_TREE)
_gtk_rbtree_test (G_STRLOC, tree); _gtk_rbtree_test (G_STRLOC, tree);
#endif
tmp_tree = tree->parent_tree; tmp_tree = tree->parent_tree;
tmp_node = tree->parent_node; tmp_node = tree->parent_node;
@ -513,8 +515,10 @@ _gtk_rbtree_remove (GtkRBTree *tree)
tmp_node = tree->parent_node; tmp_node = tree->parent_node;
_gtk_rbtree_free (tree); _gtk_rbtree_free (tree);
#ifdef G_ENABLE_DEBUG
if (gtk_debug_flags & GTK_DEBUG_TREE) if (gtk_debug_flags & GTK_DEBUG_TREE)
_gtk_rbtree_test (G_STRLOC, tmp_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; tmp_tree = tmp_tree->parent_tree;
} }
} }
#ifdef G_ENABLE_DEBUG
if (gtk_debug_flags & GTK_DEBUG_TREE) if (gtk_debug_flags & GTK_DEBUG_TREE)
_gtk_rbtree_test (G_STRLOC, tree); _gtk_rbtree_test (G_STRLOC, tree);
#endif
} }
void void
@ -1219,9 +1225,11 @@ _gtk_rbtree_remove_node (GtkRBTree *tree,
; ;
g_return_if_fail (x == tree->root); g_return_if_fail (x == tree->root);
#ifdef G_ENABLE_DEBUG
if (gtk_debug_flags & GTK_DEBUG_TREE) if (gtk_debug_flags & GTK_DEBUG_TREE)
_gtk_rbtree_test (G_STRLOC, tree); _gtk_rbtree_test (G_STRLOC, tree);
#endif
if (node->left == tree->nil || node->right == tree->nil) if (node->left == tree->nil || node->right == tree->nil)
{ {
y = node; y = node;

3
gtk/gtkrbtree.h
View File

@ -171,10 +171,11 @@ void _gtk_rbtree_prev_full (GtkRBTree *tree,
gint _gtk_rbtree_get_depth (GtkRBTree *tree); gint _gtk_rbtree_get_depth (GtkRBTree *tree);
/* This func checks the integrity of the tree */ /* This func checks the integrity of the tree */
#ifdef G_ENABLE_DEBUG
void _gtk_rbtree_test (const gchar *where, void _gtk_rbtree_test (const gchar *where,
GtkRBTree *tree); GtkRBTree *tree);
void _gtk_rbtree_debug_spew (GtkRBTree *tree); void _gtk_rbtree_debug_spew (GtkRBTree *tree);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }