Revert "combobox: Don't special-case RTL child positions anymore"

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

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index d053f86ea6624c0572c8ef6d0cd73d7684d8bae4..9ba6d1f38a99b1c96762cbdd7e0936bc14985a4d 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -12,18 +12,17 @@
  * 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_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TREE_MODEL_SORT_H__
 #define __GTK_TREE_MODEL_SORT_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gdk/gdk.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
@@ -36,36 +35,16 @@ G_BEGIN_DECLS
 #define GTK_IS_TREE_MODEL_SORT_CLASS(klass)            (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_MODEL_SORT))
 #define GTK_TREE_MODEL_SORT_GET_CLASS(obj)             (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
 
-typedef struct _GtkTreeModelSort       GtkTreeModelSort;
-typedef struct _GtkTreeModelSortClass  GtkTreeModelSortClass;
+typedef struct _GtkTreeModelSort        GtkTreeModelSort;
+typedef struct _GtkTreeModelSortClass   GtkTreeModelSortClass;
+typedef struct _GtkTreeModelSortPrivate GtkTreeModelSortPrivate;
 
 struct _GtkTreeModelSort
 {
   GObject parent;
 
   /* < private > */
-  gpointer root;
-  gint stamp;
-  guint child_flags;
-  GtkTreeModel *child_model;
-  gint zero_ref_count;
-
-  /* sort information */
-  GList *sort_list;
-  gint sort_column_id;
-  GtkSortType order;
-
-  /* default sort */
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
-
-  /* signal ids */
-  guint changed_id;
-  guint inserted_id;
-  guint has_child_toggled_id;
-  guint deleted_id;
-  guint reordered_id;
+  GtkTreeModelSortPrivate *priv;
 };
 
 struct _GtkTreeModelSortClass