Set the object name to the page title. Proposed by Eitan Isaacson

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

diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index d41c7f957fe8a0678eae3f400f380a2fd9117e0a..a576e2dff03b3709a8f57139cca7b3e8d16fe616 100644 (file)
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -17,10 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#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_SORTABLE_H__
 #define __GTK_TREE_SORTABLE_H__
 
+
 #include <gtk/gtktreemodel.h>
+#include <gtk/gtktypeutils.h>
+
 
 G_BEGIN_DECLS
 
@@ -28,10 +35,11 @@ G_BEGIN_DECLS
 #define GTK_TREE_SORTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortable))
 #define GTK_TREE_SORTABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
 #define GTK_IS_TREE_SORTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SORTABLE))
-#define GTK_TREE_SORTABLE_GET_IFACE(obj)  ((GtkTreeSortableIface *)g_type_interface_peek (((GTypeInstance *)GTK_TREE_SORTABLE (obj))->g_class, GTK_TYPE_TREE_SORTABLE))
+#define GTK_TREE_SORTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
 
 enum {
   GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID = -1,
+  GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID = -2
 };
 
 typedef struct _GtkTreeSortable      GtkTreeSortable; /* Dummy typedef */
@@ -61,11 +69,11 @@ struct _GtkTreeSortableIface
                                      gint                    sort_column_id,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
-                                     GtkDestroyNotify        destroy);
+                                     GDestroyNotify          destroy);
   void     (* set_default_sort_func) (GtkTreeSortable        *sortable,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
-                                     GtkDestroyNotify        destroy);
+                                     GDestroyNotify          destroy);
   gboolean (* has_default_sort_func) (GtkTreeSortable        *sortable);
 };
 
@@ -81,16 +89,15 @@ void     gtk_tree_sortable_set_sort_column_id    (GtkTreeSortable        *sortab
                                                  GtkSortType             order);
 void     gtk_tree_sortable_set_sort_func         (GtkTreeSortable        *sortable,
                                                  gint                    sort_column_id,
-                                                 GtkTreeIterCompareFunc  func,
-                                                 gpointer                data,
-                                                 GtkDestroyNotify        destroy);
+                                                 GtkTreeIterCompareFunc  sort_func,
+                                                 gpointer                user_data,
+                                                 GDestroyNotify          destroy);
 void     gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
-                                                 GtkTreeIterCompareFunc  func,
-                                                 gpointer                data,
-                                                 GtkDestroyNotify        destroy);
+                                                 GtkTreeIterCompareFunc  sort_func,
+                                                 gpointer                user_data,
+                                                 GDestroyNotify          destroy);
 gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable        *sortable);
-                                                 
-                                                 
+
 G_END_DECLS
 
 #endif /* __GTK_TREE_SORTABLE_H__ */