stylecontext: Do invalidation on first resize container

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

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 04e27b845ad9fcacc856cc6d64c788ac4311e892..9ba6d1f38a99b1c96762cbdd7e0936bc14985a4d 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -12,79 +12,73 @@
  * 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/>.
  */
 
 #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>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TREE_MODEL_SORT                       (gtk_tree_model_sort_get_type ())
-#define GTK_TREE_MODEL_SORT(obj)                       (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSort))
-#define GTK_TREE_MODEL_SORT_CLASS(klass)               (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
-#define GTK_IS_TREE_MODEL_SORT(obj)                    (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_IS_TREE_MODEL_SORT_CLASS(klass)            (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
-
-typedef struct _GtkTreeModelSort       GtkTreeModelSort;
-typedef struct _GtkTreeModelSortClass  GtkTreeModelSortClass;
+#define GTK_TREE_MODEL_SORT(obj)                       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSort))
+#define GTK_TREE_MODEL_SORT_CLASS(klass)               (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
+#define GTK_IS_TREE_MODEL_SORT(obj)                    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
+#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 gint (* GValueCompareFunc) (const GValue *a,
-                                   const GValue *b);
+typedef struct _GtkTreeModelSort        GtkTreeModelSort;
+typedef struct _GtkTreeModelSortClass   GtkTreeModelSortClass;
+typedef struct _GtkTreeModelSortPrivate GtkTreeModelSortPrivate;
 
 struct _GtkTreeModelSort
 {
   GObject parent;
 
   /* < private > */
-  gpointer root;
-  gint stamp;
-  guint flags;
-  GtkTreeModel *child_model;
-  gint sort_col;
-  GValueCompareFunc func;
-
-  guint changed_id;
-  guint inserted_id;
-  guint has_child_toggled_id;
-  guint deleted_id;
+  GtkTreeModelSortPrivate *priv;
 };
 
 struct _GtkTreeModelSortClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType       gtk_tree_model_sort_get_type       (void);
-GtkTreeModel *gtk_tree_model_sort_new            (void);
-GtkTreeModel *gtk_tree_model_sort_new_with_model (GtkTreeModel      *child_model,
-                                                 GValueCompareFunc  func,
-                                                 gint               sort_col);
-void          gtk_tree_model_sort_set_model      (GtkTreeModelSort  *tree_model_sort,
-                                                 GtkTreeModel      *child_model);
-GtkTreeModel *gtk_tree_model_sort_get_model      (GtkTreeModelSort  *tree_model);
-GtkTreePath  *gtk_tree_model_sort_convert_path   (GtkTreeModelSort  *tree_model_sort,
-                                                 GtkTreePath       *child_path);
-
-/* not implemented */
-void          gtk_tree_model_sort_set_sort_column (GtkTreeModelSort  *tree_model_sort,
-                                                   gint               sort_col);
-void          gtk_tree_model_sort_set_compare     (GtkTreeModelSort  *tree_model_sort,
-                                                   GValueCompareFunc  func);
-void          gtk_tree_model_sort_convert_iter    (GtkTreeModelSort  *tree_model_sort,
-                                                   GtkTreeIter       *sort_iter,
-                                                   GtkTreeIter       *child_iter);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
+GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
+
+GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
+GtkTreePath  *gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
+                                                             GtkTreePath      *child_path);
+gboolean      gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sort,
+                                                             GtkTreeIter      *sort_iter,
+                                                             GtkTreeIter      *child_iter);
+GtkTreePath  *gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
+                                                             GtkTreePath      *sorted_path);
+void          gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sort,
+                                                             GtkTreeIter      *child_iter,
+                                                             GtkTreeIter      *sorted_iter);
+void          gtk_tree_model_sort_reset_default_sort_func    (GtkTreeModelSort *tree_model_sort);
+void          gtk_tree_model_sort_clear_cache                (GtkTreeModelSort *tree_model_sort);
+gboolean      gtk_tree_model_sort_iter_is_valid              (GtkTreeModelSort *tree_model_sort,
+                                                              GtkTreeIter      *iter);
+
 
+G_END_DECLS
 
 #endif /* __GTK_TREE_MODEL_SORT_H__ */