Merge libgdk and libgtk

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

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 0d893b8484a5480d4b845becbeb087dceeeafc8d..d05305b23b87b8684965f7b316988acee92c4dda 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -17,14 +17,13 @@
  * 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
 
 #ifndef __GTK_LIST_STORE_H__
 #define __GTK_LIST_STORE_H__
 
-#include <gdk/gdkconfig.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
@@ -39,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 GSEAL (stamp);
-  gpointer GSEAL (seq);                /* head of the list */
-  gpointer GSEAL (_gtk_reserved1);
-  GList *GSEAL (sort_list);
-  gint GSEAL (n_columns);
-  gint GSEAL (sort_column_id);
-  GtkSortType GSEAL (order);
-  GType *GSEAL (column_headers);
-  gint GSEAL (length);
-  GtkTreeIterCompareFunc GSEAL (default_sort_func);
-  gpointer GSEAL (default_sort_data);
-  GtkDestroyNotify GSEAL (default_sort_destroy);
-  guint GSEAL (columns_dirty) : 1;
+  GtkListStorePrivate *priv;
 };
 
 struct _GtkListStoreClass