Updated Norwegian bokmål translation

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

diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 52dea7199db34e4d853adaa0316f91a31890583f..ccd8bc2bc9f14b91293da3d4f7869607e72efa7a 100644 (file)
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -25,8 +25,8 @@
 #define __GTK_TREE_SORTABLE_H__
 
 
+#include <gtk/gtkenums.h>
 #include <gtk/gtktreemodel.h>
-#include <gtk/gtktypeutils.h>
 
 
 G_BEGIN_DECLS
@@ -45,6 +45,28 @@ enum {
 typedef struct _GtkTreeSortable      GtkTreeSortable; /* Dummy typedef */
 typedef struct _GtkTreeSortableIface GtkTreeSortableIface;
 
+/**
+ * GtkTreeIterCompareFunc:
+ * @model: The #GtkTreeModel the comparison is within
+ * @a: A #GtkTreeIter in @model
+ * @b: Another #GtkTreeIter in @model
+ * @user_data: Data passed when the compare func is assigned e.g. by
+ *  gtk_tree_sortable_set_sort_func()
+ *
+ * A GtkTreeIterCompareFunc should return a negative integer, zero, or a positive
+ * integer if @a sorts before @b, @a sorts with @b, or @a sorts after @b
+ * respectively. If two iters compare as equal, their order in the sorted model
+ * is undefined. In order to ensure that the #GtkTreeSortable behaves as
+ * expected, the GtkTreeIterCompareFunc must define a partial order on
+ * the model, i.e. it must be reflexive, antisymmetric and transitive.
+ *
+ * For example, if @model is a product catalogue, then a compare function
+ * for the "price" column could be one which returns
+ * <literal>price_of(@a) - price_of(@b)</literal>.
+ *
+ * Returns: a negative integer, zero or a positive integer depending on whether
+ *   @a sorts before, with or after @b
+ */
 typedef gint (* GtkTreeIterCompareFunc) (GtkTreeModel *model,
                                         GtkTreeIter  *a,
                                         GtkTreeIter  *b,
@@ -67,12 +89,12 @@ struct _GtkTreeSortableIface
                                      GtkSortType             order);
   void     (* set_sort_func)         (GtkTreeSortable        *sortable,
                                      gint                    sort_column_id,
-                                     GtkTreeIterCompareFunc  func,
-                                     gpointer                data,
+                                     GtkTreeIterCompareFunc  sort_func,
+                                     gpointer                user_data,
                                      GDestroyNotify          destroy);
   void     (* set_default_sort_func) (GtkTreeSortable        *sortable,
-                                     GtkTreeIterCompareFunc  func,
-                                     gpointer                data,
+                                     GtkTreeIterCompareFunc  sort_func,
+                                     gpointer                user_data,
                                      GDestroyNotify          destroy);
   gboolean (* has_default_sort_func) (GtkTreeSortable        *sortable);
 };