Bug 534979 – GtkImageMenuItem is a bin but has two children.

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

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index aaafa5057dcfbb8c37a3f2610a2a2e121a9be41b..ece7ab8e6c200e84501804244a1f07f10bf8af94 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -17,75 +17,84 @@
  * 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_SELECTION_H__
 #define __GTK_TREE_SELECTION_H__
 
-#include <gtk/gtkobject.h>
 #include <gtk/gtktreeview.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-#define GTK_TYPE_TREE_SELECTION                        (gtk_tree_selection_get_type ())
-#define GTK_TREE_SELECTION(obj)                        (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelection))
-#define GTK_TREE_SELECTION_CLASS(klass)                (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
-#define GTK_IS_TREE_SELECTION(obj)             (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
-#define GTK_IS_TREE_SELECTION_CLASS(klass)     (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
 
-typedef enum
-{
-  GTK_TREE_SELECTION_SINGLE,
-  GTK_TREE_SELECTION_MULTI
-} GtkTreeSelectionMode;
+#define GTK_TYPE_TREE_SELECTION                        (gtk_tree_selection_get_type ())
+#define GTK_TREE_SELECTION(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelection))
+#define GTK_TREE_SELECTION_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
+#define GTK_IS_TREE_SELECTION(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
+#define GTK_IS_TREE_SELECTION_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_SELECTION))
+#define GTK_TREE_SELECTION_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
 
 typedef gboolean (* GtkTreeSelectionFunc)    (GtkTreeSelection  *selection,
                                              GtkTreeModel      *model,
                                              GtkTreePath       *path,
+                                              gboolean           path_currently_selected,
                                              gpointer           data);
 typedef void (* GtkTreeSelectionForeachFunc) (GtkTreeModel      *model,
+                                             GtkTreePath       *path,
                                              GtkTreeIter       *iter,
                                              gpointer           data);
 
 struct _GtkTreeSelection
 {
-  GtkObject parent;
+  GObject parent;
 
   /*< private >*/
-  
-  GtkTreeView *tree_view;
-  GtkTreeSelectionMode type;
-  GtkTreeSelectionFunc user_func;
-  gpointer user_data;
-  GtkDestroyNotify destroy;
+
+  GtkTreeView *GSEAL (tree_view);
+  GtkSelectionMode GSEAL (type);
+  GtkTreeSelectionFunc GSEAL (user_func);
+  gpointer GSEAL (user_data);
+  GDestroyNotify GSEAL (destroy);
 };
 
 struct _GtkTreeSelectionClass
 {
-  GtkObjectClass parent_class;
+  GObjectClass parent_class;
+
+  void (* changed) (GtkTreeSelection *selection);
 
-  void (* selection_changed) (GtkTreeView *tree_view);
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType          gtk_tree_selection_get_type            (void);
+GType            gtk_tree_selection_get_type            (void) G_GNUC_CONST;
 
 void             gtk_tree_selection_set_mode            (GtkTreeSelection            *selection,
-                                                        GtkTreeSelectionMode         type);
+                                                        GtkSelectionMode             type);
+GtkSelectionMode gtk_tree_selection_get_mode        (GtkTreeSelection            *selection);
 void             gtk_tree_selection_set_select_function (GtkTreeSelection            *selection,
                                                         GtkTreeSelectionFunc         func,
                                                         gpointer                     data,
-                                                        GtkDestroyNotify             destroy);
+                                                        GDestroyNotify               destroy);
 gpointer         gtk_tree_selection_get_user_data       (GtkTreeSelection            *selection);
 GtkTreeView*     gtk_tree_selection_get_tree_view       (GtkTreeSelection            *selection);
 
-/* Only meaningful if GTK_TREE_SELECTION_SINGLE is set */
-/* Use selected_foreach for GTK_TREE_SELECTION_MULTI */
+GtkTreeSelectionFunc gtk_tree_selection_get_select_function (GtkTreeSelection        *selection);
+
+/* Only meaningful if GTK_SELECTION_SINGLE or GTK_SELECTION_BROWSE is set */
+/* Use selected_foreach or get_selected_rows for GTK_SELECTION_MULTIPLE */
 gboolean         gtk_tree_selection_get_selected        (GtkTreeSelection            *selection,
                                                         GtkTreeModel               **model,
                                                         GtkTreeIter                 *iter);
-
-/* FIXME: Get a more convenient get_selection function????  one returning GSList?? */
+GList *          gtk_tree_selection_get_selected_rows   (GtkTreeSelection            *selection,
+                                                         GtkTreeModel               **model);
+gint             gtk_tree_selection_count_selected_rows (GtkTreeSelection            *selection);
 void             gtk_tree_selection_selected_foreach    (GtkTreeSelection            *selection,
                                                         GtkTreeSelectionForeachFunc  func,
                                                         gpointer                     data);
@@ -97,17 +106,20 @@ void             gtk_tree_selection_select_iter         (GtkTreeSelection
                                                         GtkTreeIter                 *iter);
 void             gtk_tree_selection_unselect_iter       (GtkTreeSelection            *selection,
                                                         GtkTreeIter                 *iter);
+gboolean         gtk_tree_selection_path_is_selected    (GtkTreeSelection            *selection,
+                                                        GtkTreePath                 *path);
+gboolean         gtk_tree_selection_iter_is_selected    (GtkTreeSelection            *selection,
+                                                        GtkTreeIter                 *iter);
 void             gtk_tree_selection_select_all          (GtkTreeSelection            *selection);
 void             gtk_tree_selection_unselect_all        (GtkTreeSelection            *selection);
 void             gtk_tree_selection_select_range        (GtkTreeSelection            *selection,
                                                         GtkTreePath                 *start_path,
                                                         GtkTreePath                 *end_path);
+void             gtk_tree_selection_unselect_range      (GtkTreeSelection            *selection,
+                                                         GtkTreePath                 *start_path,
+                                                        GtkTreePath                 *end_path);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TREE_SELECTION_H__ */
-