X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fgtktree.h;h=7aadb318279e7b766ac985539c2eff7d9f7bfa6c;hb=3f8461b76909179c3164c26664b4250b886e053c;hp=aaacd86c2f43a22f6c39eba17010d42313c5f732;hpb=e9f322e2f020e977c1fe6b0fb93807d978da16a2;p=~andy%2Fgtk

diff --git a/gtk/gtktree.h b/gtk/gtktree.h
index aaacd86c2..7aadb3182 100644
--- a/gtk/gtktree.h
+++ b/gtk/gtktree.h
@@ -2,22 +2,35 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#ifdef GTK_ENABLE_BROKEN
+
 #ifndef __GTK_TREE_H__
 #define __GTK_TREE_H__
 
+/* set this flag to enable tree debugging output */
+/* #define TREE_DEBUG */
 
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
@@ -28,13 +41,17 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_TREE(obj)          GTK_CHECK_CAST (obj, gtk_tree_get_type (), GtkTree)
-#define GTK_TREE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_tree_get_type (), GtkTreeClass)
-#define GTK_IS_TREE(obj)       GTK_CHECK_TYPE (obj, gtk_tree_get_type ())
+#define GTK_TYPE_TREE                  (gtk_tree_get_type ())
+#define GTK_TREE(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE, GtkTree))
+#define GTK_TREE_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass))
+#define GTK_IS_TREE(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE))
+#define GTK_IS_TREE_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE))
+#define GTK_TREE_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE, GtkTreeClass))
+
 
-#define GTK_IS_ROOT_TREE(obj)   (GTK_TREE(obj)->root_tree == NULL)
+#define GTK_IS_ROOT_TREE(obj)   ((GtkObject*) GTK_TREE(obj)->root_tree == (GtkObject*)obj)
 #define GTK_TREE_ROOT_TREE(obj) (GTK_TREE(obj)->root_tree ? GTK_TREE(obj)->root_tree : GTK_TREE(obj))
-#define GTK_TREE_SELECTION(obj) (GTK_TREE_ROOT_TREE(obj)->selection)
+#define GTK_TREE_SELECTION_OLD(obj) (GTK_TREE_ROOT_TREE(obj)->selection)
 
 typedef enum 
 {
@@ -48,7 +65,7 @@ typedef struct _GtkTreeClass  GtkTreeClass;
 struct _GtkTree
 {
   GtkContainer container;
-
+  
   GList *children;
   
   GtkTree* root_tree; /* owner of selection list */
@@ -65,7 +82,7 @@ struct _GtkTree
 struct _GtkTreeClass
 {
   GtkContainerClass parent_class;
-
+  
   void (* selection_changed) (GtkTree   *tree);
   void (* select_child)      (GtkTree   *tree,
 			      GtkWidget *child);
@@ -74,17 +91,15 @@ struct _GtkTreeClass
 };
 
 
-guint      gtk_tree_get_type           (void);
+GtkType    gtk_tree_get_type           (void) G_GNUC_CONST;
 GtkWidget* gtk_tree_new                (void);
 void       gtk_tree_append             (GtkTree          *tree,
-				        GtkWidget        *child);
+				        GtkWidget        *tree_item);
 void       gtk_tree_prepend            (GtkTree          *tree,
-				        GtkWidget        *child);
+				        GtkWidget        *tree_item);
 void       gtk_tree_insert             (GtkTree          *tree,
-				        GtkWidget        *child,
+				        GtkWidget        *tree_item,
 				        gint              position);
-void       gtk_tree_remove_item        (GtkTree          *tree,
-				        GtkWidget        *child);
 void       gtk_tree_remove_items       (GtkTree          *tree,
 				        GList            *items);
 void       gtk_tree_clear_items        (GtkTree          *tree,
@@ -95,9 +110,9 @@ void       gtk_tree_select_item        (GtkTree          *tree,
 void       gtk_tree_unselect_item      (GtkTree          *tree,
 				        gint              item);
 void       gtk_tree_select_child       (GtkTree          *tree,
-				        GtkWidget        *child);
+				        GtkWidget        *tree_item);
 void       gtk_tree_unselect_child     (GtkTree          *tree,
-				        GtkWidget        *child);
+				        GtkWidget        *tree_item);
 gint       gtk_tree_child_position     (GtkTree          *tree,
 				        GtkWidget        *child);
 void       gtk_tree_set_selection_mode (GtkTree          *tree,
@@ -105,10 +120,19 @@ void       gtk_tree_set_selection_mode (GtkTree          *tree,
 void       gtk_tree_set_view_mode      (GtkTree          *tree,
 				        GtkTreeViewMode   mode); 
 void       gtk_tree_set_view_lines     (GtkTree          *tree,
-					guint            flag);
+					gboolean	  flag);
+
+/* deprecated function, use gtk_container_remove instead.
+ */
+void       gtk_tree_remove_item        (GtkTree          *tree,
+				        GtkWidget        *child);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 
 #endif /* __GTK_TREE_H__ */
+
+#endif /* GTK_ENABLE_BROKEN */