X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkliststore.h;h=568e10cd2bfda56fe01b15951966d26f66c81bd9;hb=f3e7c06a826ef4dcb021e27a0198713c47d4b1de;hp=b61fc1c48aab81ba9f9349dfe7283b814a315db5;hpb=c49739a0b4d438881dd69dc6cad8c53cfddef176;p=~andy%2Fgtk

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index b61fc1c48..568e10cd2 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -12,20 +12,22 @@
  * Library 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_LIST_STORE_H__
 #define __GTK_LIST_STORE_H__
 
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_LIST_STORE	       (gtk_list_store_get_type ())
 #define GTK_LIST_STORE(obj)	       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST_STORE, GtkListStore))
@@ -34,27 +36,16 @@ extern "C" {
 #define GTK_IS_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_STORE))
 #define GTK_LIST_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass))
 
-typedef struct _GtkListStore       GtkListStore;
-typedef struct _GtkListStoreClass  GtkListStoreClass;
+typedef struct _GtkListStore              GtkListStore;
+typedef struct _GtkListStorePrivate       GtkListStorePrivate;
+typedef struct _GtkListStoreClass         GtkListStoreClass;
 
 struct _GtkListStore
 {
   GObject parent;
 
   /*< private >*/
-  gint stamp;
-  gpointer seq;		/* head of the list */
-  gpointer _gtk_reserved1;
-  GList *sort_list;	
-  gint n_columns;
-  gint sort_column_id;
-  GtkSortType order;
-  GType *column_headers;
-  gint length;
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-  guint columns_dirty : 1;
+  GtkListStorePrivate *priv;
 };
 
 struct _GtkListStoreClass
@@ -69,7 +60,7 @@ struct _GtkListStoreClass
 };
 
 
-GType         gtk_list_store_get_type         (void);
+GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
 GtkListStore *gtk_list_store_new              (gint          n_columns,
 					       ...);
 GtkListStore *gtk_list_store_newv             (gint          n_columns,
@@ -87,6 +78,11 @@ void          gtk_list_store_set_value        (GtkListStore *list_store,
 void          gtk_list_store_set              (GtkListStore *list_store,
 					       GtkTreeIter  *iter,
 					       ...);
+void          gtk_list_store_set_valuesv      (GtkListStore *list_store,
+					       GtkTreeIter  *iter,
+					       gint         *columns,
+					       GValue       *values,
+					       gint          n_values);
 void          gtk_list_store_set_valist       (GtkListStore *list_store,
 					       GtkTreeIter  *iter,
 					       va_list       var_args);
@@ -101,6 +97,16 @@ void          gtk_list_store_insert_before    (GtkListStore *list_store,
 void          gtk_list_store_insert_after     (GtkListStore *list_store,
 					       GtkTreeIter  *iter,
 					       GtkTreeIter  *sibling);
+void          gtk_list_store_insert_with_values  (GtkListStore *list_store,
+						  GtkTreeIter  *iter,
+						  gint          position,
+						  ...);
+void          gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
+						  GtkTreeIter  *iter,
+						  gint          position,
+						  gint         *columns,
+						  GValue       *values,
+						  gint          n_values);
 void          gtk_list_store_prepend          (GtkListStore *list_store,
 					       GtkTreeIter  *iter);
 void          gtk_list_store_append           (GtkListStore *list_store,
@@ -121,9 +127,7 @@ void          gtk_list_store_move_before      (GtkListStore *store,
                                                GtkTreeIter  *position);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_LIST_STORE_H__ */