Use gtk_accel_grouop_get_is_locked() rather than trying to access group->lock_count.

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

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index be83cdbfc14f6df4d38ef6c6832f5f9a192d2ad6..267a2af37e0f228d054ded330f4dbdf3d8e01022 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -17,22 +17,24 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !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 ((klass), GTK_TYPE_TREE_SELECTION))
-#define GTK_TREE_SELECTION_GET_CLASS(obj)       (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
+#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,
@@ -49,12 +51,12 @@ struct _GtkTreeSelection
   GObject parent;
 
   /*< private >*/
-  
-  GtkTreeView *tree_view;
-  GtkSelectionMode 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
@@ -71,7 +73,7 @@ struct _GtkTreeSelectionClass
 };
 
 
-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,
                                                         GtkSelectionMode             type);
@@ -79,10 +81,12 @@ GtkSelectionMode gtk_tree_selection_get_mode        (GtkTreeSelection
 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);
 
+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,
@@ -116,10 +120,6 @@ void             gtk_tree_selection_unselect_range      (GtkTreeSelection
                                                         GtkTreePath                 *end_path);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TREE_SELECTION_H__ */
-