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 2c3e0a2b822aea9d594a005f49a897383a732674..267a2af37e0f228d054ded330f4dbdf3d8e01022 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -17,13 +17,15 @@
  * 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 <glib-object.h>
 #include <gtk/gtktreeview.h>
 
-
 G_BEGIN_DECLS
 
 
@@ -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
@@ -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,
@@ -118,6 +122,4 @@ void             gtk_tree_selection_unselect_range      (GtkTreeSelection
 
 G_END_DECLS
 
-
 #endif /* __GTK_TREE_SELECTION_H__ */
-