Clean up debug features

Introduce a GTK_DEBUG_CHECK() macro and use it to check for
GTK_DEBUG flags everywhere. Also guard all such places by

1 files changed, 46 insertions, 21 deletions

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index b53e5f0df0..366793d190 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -754,10 +754,12 @@ _gtk_text_btree_delete (GtkTextIter *start,
   gtk_text_iter_order (start, end);
 
   tree = _gtk_text_iter_get_btree (start);
- 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
-  
+#endif
+
   /* Broadcast the need for redisplay before we break the iterators */
   DV (g_print ("invalidating due to deleting some text (%s)\n", G_STRLOC));
   _gtk_text_btree_invalidate_region (tree, start, end, FALSE);
@@ -1077,8 +1079,10 @@ _gtk_text_btree_delete (GtkTextIter *start,
   chars_changed (tree);
   segments_changed (tree);
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 
   /* Re-initialize our iterators */
   _gtk_text_btree_get_iter_at_line (tree, start, start_line, start_byte_offset);
@@ -1359,8 +1363,10 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
 {
   gint current_y = 0;
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 
   if (node->level == 0)
     {
@@ -2011,8 +2017,10 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig,
 
   queue_tag_redisplay (tree, tag, &start, &end);
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 }
 
 
@@ -2736,9 +2744,11 @@ real_set_mark (GtkTextBTree      *tree,
   
   iter = *where;
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_iter_check (&iter);
-  
+#endif
+
   if (mark != NULL)
     {
       if (redraw_selections &&
@@ -2793,9 +2803,11 @@ real_set_mark (GtkTextBTree      *tree,
                              mark);
     }
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_iter_check (&iter);
-  
+#endif
+
   /* Link mark into new location */
   gtk_text_btree_link_segment (mark, &iter);
 
@@ -2808,12 +2820,14 @@ real_set_mark (GtkTextBTree      *tree,
 
   redisplay_mark_if_visible (mark);
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
-    _gtk_text_iter_check (&iter);
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
+    {
+      _gtk_text_iter_check (&iter);
+      _gtk_text_btree_check (tree);
+    }
+#endif
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
-    _gtk_text_btree_check (tree);
-  
   return mark;
 }
 
@@ -4329,8 +4343,10 @@ _gtk_text_line_next_could_contain_tag (GtkTextLine  *line,
 
   g_return_val_if_fail (line != NULL, NULL);
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 
   if (tag == NULL)
     {
@@ -4492,8 +4508,10 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
 
   g_return_val_if_fail (line != NULL, NULL);
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 
   if (tag == NULL)
     {
@@ -5264,8 +5282,10 @@ _gtk_text_btree_validate (GtkTextBTree *tree,
       if (new_height)
         *new_height = state.new_height;
 
-      if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+      if (GTK_DEBUG_CHECK (TEXT))
         _gtk_text_btree_check (tree);
+#endif
 
       return TRUE;
     }
@@ -5973,8 +5993,10 @@ post_insert_fixup (GtkTextBTree *tree,
       gtk_text_btree_rebalance (tree, node);
     }
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 }
 
 static GtkTextTagInfo*
@@ -6539,8 +6561,10 @@ gtk_text_btree_link_segment (GtkTextLineSegment *seg,
   cleanup_line (line);
   segments_changed (tree);
 
-  if (gtk_get_debug_flags () & GTK_DEBUG_TEXT)
+#ifdef G_ENABLE_DEBUG
+  if (GTK_DEBUG_CHECK (TEXT))
     _gtk_text_btree_check (tree);
+#endif
 }
 
 static void
@@ -6634,7 +6658,7 @@ _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
 /*
  * Debug
  */
-
+#ifdef G_ENABLE_DEBUG
 static void
 gtk_text_btree_node_view_check_consistency (GtkTextBTree     *tree,
                                             GtkTextBTreeNode *node,
@@ -7081,6 +7105,7 @@ _gtk_text_btree_check (GtkTextBTree *tree)
                seg->body.chars);
     }
 }
+#endif /* G_ENABLE_DEBUG */
 
 void _gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line);
 void _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment* seg);