Bug 546756 – gnome-panel crashed with SIGSEGV in

[~andy/gtk] / gtk / gtkrbtree.h

diff --git a/gtk/gtkrbtree.h b/gtk/gtkrbtree.h
index 9db2ae2c26d983298fbe044f0c836ec2ff119b4c..c42a6addbe150f2cf7c1571b158a9afe92c3c571 100644 (file)
--- a/gtk/gtkrbtree.h
+++ b/gtk/gtkrbtree.h
@@ -22,11 +22,12 @@
 #ifndef __GTK_RBTREE_H__
 #define __GTK_RBTREE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib.h>
+
+
+G_BEGIN_DECLS
+
+
 typedef enum
 {
   GTK_RBNODE_BLACK = 1 << 0,
@@ -110,8 +111,6 @@ struct _GtkRBNode
 #define GTK_RBNODE_FLAG_SET(node, flag)        (node?(((node->flags&flag)==flag)?TRUE:FALSE):FALSE)
 
 
-void       _gtk_rbtree_push_allocator   (GAllocator             *allocator);
-void       _gtk_rbtree_pop_allocator    (void);
 GtkRBTree *_gtk_rbtree_new              (void);
 void       _gtk_rbtree_free             (GtkRBTree              *tree);
 void       _gtk_rbtree_remove           (GtkRBTree              *tree);
@@ -139,6 +138,10 @@ void       _gtk_rbtree_node_mark_invalid(GtkRBTree              *tree,
 void       _gtk_rbtree_node_mark_valid  (GtkRBTree              *tree,
                                         GtkRBNode              *node);
 void       _gtk_rbtree_column_invalid   (GtkRBTree              *tree);
+void       _gtk_rbtree_mark_invalid     (GtkRBTree              *tree);
+void       _gtk_rbtree_set_fixed_height (GtkRBTree              *tree,
+                                        gint                    height,
+                                        gboolean                mark_valid);
 gint       _gtk_rbtree_node_find_offset (GtkRBTree              *tree,
                                         GtkRBNode              *node);
 gint       _gtk_rbtree_node_find_parity (GtkRBTree              *tree,
@@ -167,14 +170,15 @@ void       _gtk_rbtree_prev_full        (GtkRBTree              *tree,
 
 gint       _gtk_rbtree_get_depth        (GtkRBTree              *tree);
 
-/* This func just checks the integrity of the tree */
-/* It will go away later. */
+/* 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
+
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 #endif /* __GTK_RBTREE_H__ */