New functions to clear a model.

Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_clear):
	* gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
	clear a model.

diff --git a/ChangeLog b/ChangeLog
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 45ad19f43d78f9f4a51257d9efbce8765c83e6a6..78b50886bacb2a9cbc634aec24258e152e4669f6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_clear): 
+       * gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
+       clear a model.
+
 Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 9bf31fa2bc26719aa424ccc8725367fdc1f3be70..81bbaf0dcb8411ca983320bcedc108a8fa1822d1 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1150,6 +1150,21 @@ gtk_list_store_append (GtkListStore *list_store,
   gtk_tree_path_free (path);
 }
 
+void
+gtk_list_store_clear (GtkListStore *list_store)
+{
+  GtkTreeIter iter;
+  g_return_if_fail (GTK_IS_LIST_STORE (list_store));
+
+  while (list_store->root)
+    {
+      iter.stamp = list_store->stamp;
+      iter.user_data = list_store->root;
+      gtk_list_store_remove (list_store, &iter);
+    }
+}
+
+
 static gboolean
 gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
                                  GtkTreePath       *path)
@@ -1161,14 +1176,10 @@ gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
                                &iter,
                                path))
     {
-      gtk_list_store_remove (GTK_LIST_STORE (drag_source),
-                             &iter);
+      gtk_list_store_remove (GTK_LIST_STORE (drag_source), &iter);
       return TRUE;
     }
-  else
-    {
-      return FALSE;
-    }
+  return FALSE;
 }
 
 static gboolean

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 61c806d93ba830ee89aa52f87c12fd4d1ce5c367..1d6348872718689f69a20e3723876f09cbefdee7 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -93,7 +93,7 @@ void          gtk_list_store_prepend         (GtkListStore *store,
                                              GtkTreeIter  *iter);
 void          gtk_list_store_append          (GtkListStore *store,
                                              GtkTreeIter  *iter);
-
+void          gtk_list_store_clear           (GtkListStore *store);
 
 
 #ifdef __cplusplus

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 7a0b544acc432a00f2a35779b0ff9d0d885ddabd..28b82b6c3d2329ef76c999c763956ad399b7b0f3 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -1059,6 +1059,21 @@ gtk_tree_store_iter_depth (GtkTreeStore *model,
   return g_node_depth (G_NODE (iter->user_data)) - 1;
 }
 
+
+void
+gtk_tree_store_clear (GtkTreeStore *tree_store)
+{
+  GtkTreeIter iter;
+  g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+
+  while (G_NODE (tree_store->root)->children)
+    {
+      iter.stamp = tree_store->stamp;
+      iter.user_data = G_NODE (tree_store->root)->children;
+      gtk_tree_store_remove (tree_store, &iter);
+    }
+}
+
 /* DND */
 
 
@@ -1763,3 +1778,4 @@ validate_gnode (GNode* node)
 }
 
 
+

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 76c6ff63fcb2ca412ae654ab5d17af74a04460ff..b6cf74a2d2b48ddc10960e05ca27dc3ff191dc7c 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -103,7 +103,7 @@ gboolean      gtk_tree_store_is_ancestor     (GtkTreeStore *tree_store,
                                              GtkTreeIter  *descendant);
 gint          gtk_tree_store_iter_depth      (GtkTreeStore *tree_store,
                                              GtkTreeIter  *iter);
-
+void          gtk_tree_store_clear           (GtkTreeStore *tree_store);
 
 #ifdef __cplusplus
 }