]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkaccelgroup.h
Adapt cast macros to standard.
[~andy/gtk] / gtk / gtkaccelgroup.h
index afa63485723ee8b1db2d4fb732109c407af4d87b..2db22ad606e16f6a56823a4df75066e7d83d7201 100644 (file)
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #ifndef __GTK_ACCEL_GROUP_H__
 #define __GTK_ACCEL_GROUP_H__
 
@@ -75,26 +83,42 @@ struct _GtkAccelEntry
 };
 
 
+/* Accelerators
+ */
+gboolean gtk_accelerator_valid               (guint            keyval,
+                                              GdkModifierType  modifiers);
+void    gtk_accelerator_parse                (const gchar     *accelerator,
+                                              guint           *accelerator_key,
+                                              GdkModifierType *accelerator_mods);
+gchar*  gtk_accelerator_name                 (guint            accelerator_key,
+                                              GdkModifierType  accelerator_mods);
+void    gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
+guint   gtk_accelerator_get_default_mod_mask (void);
+
+
 /* Accelerator Groups
  */
 GtkAccelGroup*  gtk_accel_group_new            (void);
 GtkAccelGroup*  gtk_accel_group_get_default            (void);
 GtkAccelGroup*  gtk_accel_group_ref            (GtkAccelGroup  *accel_group);
 void           gtk_accel_group_unref           (GtkAccelGroup  *accel_group);
-gboolean        gtk_accel_group_activate       (GtkAccelGroup  *accel_group,
+void           gtk_accel_group_lock            (GtkAccelGroup  *accel_group);
+void           gtk_accel_group_unlock          (GtkAccelGroup  *accel_group);
+gboolean        gtk_accel_groups_activate              (GtkObject      *object,
                                                 guint           accel_key,
                                                 GdkModifierType accel_mods);
-gboolean        gtk_accel_groups_activate              (GtkObject      *object,
+
+/* internal functions
+ */
+gboolean        gtk_accel_group_activate       (GtkAccelGroup  *accel_group,
                                                 guint           accel_key,
                                                 GdkModifierType accel_mods);
 void           gtk_accel_group_attach          (GtkAccelGroup  *accel_group,
                                                 GtkObject      *object);
 void           gtk_accel_group_detach          (GtkAccelGroup  *accel_group,
                                                 GtkObject      *object);
-void           gtk_accel_group_lock            (GtkAccelGroup  *accel_group);
-void           gtk_accel_group_unlock          (GtkAccelGroup  *accel_group);
 
-/* Accelerator Group Entries
+/* Accelerator Group Entries (internal)
  */
 GtkAccelEntry*         gtk_accel_group_get_entry       (GtkAccelGroup  *accel_group,
                                                 guint           accel_key,
@@ -116,7 +140,7 @@ void                gtk_accel_group_remove          (GtkAccelGroup  *accel_group,
                                                 GdkModifierType accel_mods,
                                                 GtkObject      *object);
 
-/* Accelerator Signals
+/* Accelerator Signals (internal)
  */
 void           gtk_accel_group_handle_add      (GtkObject      *object,
                                                 guint           accel_signal_id,
@@ -143,25 +167,12 @@ void              gtk_accel_group_marshal_remove  (GtkObject      *object,
                                                 gpointer        func_data,
                                                 GtkArg         *args);
 
-/* Miscellaneous
+/* Miscellaneous (internal)
  */
 GSList*        gtk_accel_groups_from_object            (GtkObject      *object);
 GSList*        gtk_accel_group_entries_from_object     (GtkObject      *object);
 
 
-/* Accelerators
- */
-gboolean gtk_accelerator_valid               (guint            keyval,
-                                              GdkModifierType  modifiers);
-void    gtk_accelerator_parse                (const gchar     *accelerator,
-                                              guint           *accelerator_key,
-                                              GdkModifierType *accelerator_mods);
-gchar*  gtk_accelerator_name                 (guint            accelerator_key,
-                                              GdkModifierType  accelerator_mods);
-void    gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
-guint   gtk_accelerator_get_default_mod_mask (void);
-
-
 
 #ifdef __cplusplus
 }