X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktreemodelfilter.h;h=832de5069844404eb177359bd91f42fbd2e8a455;hb=02e915273845b21af223e7e5e2425569afcf1b83;hp=79e30fd31c36bbbc468eb64554c948331cc5d33c;hpb=15a5f153b1f6bb7c17b2d2255bac4fe0ef617ed1;p=~andy%2Fgtk

diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 79e30fd31..832de5069 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -13,19 +13,16 @@
  * 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_FILTER_H__
 #define __GTK_TREE_MODEL_FILTER_H__
 
-#include <gdkconfig.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtktreemodel.h>
 
 G_BEGIN_DECLS
@@ -37,9 +34,38 @@ G_BEGIN_DECLS
 #define GTK_IS_TREE_MODEL_FILTER_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_TREE_MODEL_FILTER))
 #define GTK_TREE_MODEL_FILTER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterClass))
 
+/**
+ * GtkTreeModelFilterVisibleFunc:
+ * @model: the child model of the #GtkTreeModelFilter
+ * @iter: a #GtkTreeIter pointing to the row in @model whose visibility
+ *   is determined
+ * @data: (closure): user data given to gtk_tree_model_filter_set_visible_func()
+ *
+ * A function which decides whether the row indicated by @iter is visible.
+ *
+ * Returns: Whether the row indicated by @iter is visible.
+ */
 typedef gboolean (* GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
                                                     GtkTreeIter  *iter,
                                                     gpointer      data);
+
+/**
+ * GtkTreeModelFilterModifyFunc:
+ * @model: the #GtkTreeModelFilter
+ * @iter: a #GtkTreeIter pointing to the row whose display values are determined
+ * @value: A #GValue which is already initialized for with the correct type for
+ *  the column @column.
+ * @column: the column whose display value is determined
+ * @data: (closure): user data given to gtk_tree_model_filter_set_modify_func()
+ *
+ * A function which calculates display values from raw values in the model.
+ * It must fill @value with the display value for the column @column in the
+ * row indicated by @iter.
+ *
+ * Since this function is called for each data access, it's not a
+ * particularly efficient operation.
+ */
+
 typedef void (* GtkTreeModelFilterModifyFunc) (GtkTreeModel *model,
                                                GtkTreeIter  *iter,
                                                GValue       *value,
@@ -55,18 +81,27 @@ struct _GtkTreeModelFilter
   GObject parent;
 
   /*< private >*/
-  GtkTreeModelFilterPrivate *GSEAL (priv);
+  GtkTreeModelFilterPrivate *priv;
 };
 
 struct _GtkTreeModelFilterClass
 {
   GObjectClass parent_class;
 
+  gboolean (* visible) (GtkTreeModelFilter *self,
+                        GtkTreeModel       *child_model,
+                        GtkTreeIter        *iter);
+  void (* modify) (GtkTreeModelFilter *self,
+                   GtkTreeModel       *child_model,
+                   GtkTreeIter        *iter,
+                   GValue             *value,
+                   gint                column);
+
   /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 /* base */