Welcome _gtk_tree_view_column_get_cell_at_pos to the second dimension

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

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index cc39aa531626f7404b662a00481632c9f52825a6..bb5910c5e91183844a464617ff3ca9f4cb8f2b9c 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -17,14 +17,14 @@
  * 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_TREE_MODEL_SORT_H__
 #define __GTK_TREE_MODEL_SORT_H__
 
-#include <gdk/gdkconfig.h>
+#include <gdkconfig.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
@@ -62,11 +62,11 @@ struct _GtkTreeModelSort
   GDestroyNotify GSEAL (default_sort_destroy);
 
   /* signal ids */
-  guint GSEAL (changed_id);
-  guint GSEAL (inserted_id);
-  guint GSEAL (has_child_toggled_id);
-  guint GSEAL (deleted_id);
-  guint GSEAL (reordered_id);
+  gulong GSEAL (changed_id);
+  gulong GSEAL (inserted_id);
+  gulong GSEAL (has_child_toggled_id);
+  gulong GSEAL (deleted_id);
+  gulong GSEAL (reordered_id);
 };
 
 struct _GtkTreeModelSortClass