Merge libgdk and libgtk

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

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 8e3ece76abfd35d78cfe5a6b6d240a50f80567f5..d05305b23b87b8684965f7b316988acee92c4dda 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -38,27 +38,16 @@ G_BEGIN_DECLS
 #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
@@ -93,7 +82,7 @@ void          gtk_list_store_set              (GtkListStore *list_store,
                                               ...);
 void          gtk_list_store_set_valuesv      (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
-                                              gint         *columns, 
+                                              gint         *columns,
                                               GValue       *values,
                                               gint          n_values);
 void          gtk_list_store_set_valist       (GtkListStore *list_store,
@@ -117,7 +106,7 @@ void          gtk_list_store_insert_with_values  (GtkListStore *list_store,
 void          gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
                                                  GtkTreeIter  *iter,
                                                  gint          position,
-                                                 gint         *columns, 
+                                                 gint         *columns,
                                                  GValue       *values,
                                                  gint          n_values);
 void          gtk_list_store_prepend          (GtkListStore *list_store,