summaryrefslogtreecommitdiff
path: root/gtk/gtkaccelgroup.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-06-09 07:11:55 +0000
committerTim Janik <timj@src.gnome.org>1998-06-09 07:11:55 +0000
commita21d063ef867d0df151872f79cb04db8e730c42a (patch)
tree4e39ac11c98f2da3e38430d09843f6c74e007b07 /gtk/gtkaccelgroup.h
parent257c54a0210d75fd17d19d555a90c52a07693ef4 (diff)
downloadgtk+-a21d063ef867d0df151872f79cb04db8e730c42a.tar.gz
new functions gtk_selection_data_copy and gtk_selection_data_free.
Tue Jun 9 01:57:23 1998 Tim Janik <timj@gtk.org> * gtk/gtkselection.h: * gtk/gtkselection.c: new functions gtk_selection_data_copy and gtk_selection_data_free. * gtk/gtkwidget.c (gtk_widget_class_init): fixed gtk_signal_new() call for "selection_received", which was completely bogus. * other fixups to gtk_signal_new() calls all over the place. * gtk/gtktypebuiltins.h: types as variables (formerly macros). * gtk/gtktypebuiltins_vars.c: type variable implementations. * gtk/gtktypebuiltins_ids.c: array entries for builtin type declarations. * gtk/gtktypebuiltins_evals.c: enum value arrays. * gtk/gtk-boxed.defs: gtk and gdk structure definitions, used to build gtk.defs. * gtk/gtk.defs: generated file with scheme syntax for type definitions of gtk and gdk structures and enums. * gtk/gtktypeutils.h: * gtk/gtktypeutils.c: reworked type ids, so they are variables not macros anymore (this fixes binary incompatibility with new enum definitions). * gtk/gtkwidget.c (gtk_widget_real_key_press_event): proccess possible key bindings for this widget. * gtk/gtkwindow.c (gtk_window_key_press_event): chain parent class' handler. * gtk/gtkobject.h: * gtk/gtkobject.c: removed gtk_object_class_new_user_signal_no_recurse() again. new functions gtk_object_class_user_signal_new () and gtk_object_class_user_signal_newv (), to feature the GtkSignalRunType flag on the signal creation. Mon Jun 8 20:52:21 1998 Tim Janik <timj@gtk.org> * gtk/gtkcontainer.h: new signal GtkContainer::set_focus_child.
Diffstat (limited to 'gtk/gtkaccelgroup.h')
-rw-r--r--gtk/gtkaccelgroup.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 7b72860fd1..ffa60850aa 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -48,10 +48,10 @@ typedef struct _GtkAccelEntry GtkAccelEntry;
struct _GtkAccelGroup
{
- guint ref_count;
- guint lock_count;
- guint modifier_mask;
- GSList *attach_objects;
+ guint ref_count;
+ guint lock_count;
+ GdkModifierType modifier_mask;
+ GSList *attach_objects;
};
struct _GtkAccelEntry
@@ -60,7 +60,7 @@ struct _GtkAccelEntry
*/
GtkAccelGroup *accel_group;
guint accelerator_key;
- guint accelerator_mods;
+ GdkModifierType accelerator_mods;
GtkAccelFlags accel_flags;
GtkObject *object;
@@ -76,10 +76,10 @@ GtkAccelGroup* gtk_accel_group_ref (GtkAccelGroup *accel_group);
void gtk_accel_group_unref (GtkAccelGroup *accel_group);
gboolean gtk_accel_group_activate (GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods);
+ GdkModifierType accel_mods);
gboolean gtk_accel_groups_activate (GtkObject *object,
guint accel_key,
- guint accel_mods);
+ GdkModifierType accel_mods);
void gtk_accel_group_attach (GtkAccelGroup *accel_group,
GtkObject *object);
void gtk_accel_group_detach (GtkAccelGroup *accel_group,
@@ -91,22 +91,22 @@ void gtk_accel_group_unlock (GtkAccelGroup *accel_group);
*/
GtkAccelEntry* gtk_accel_group_get_entry (GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods);
+ GdkModifierType accel_mods);
void gtk_accel_group_lock_entry (GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods);
+ GdkModifierType accel_mods);
void gtk_accel_group_unlock_entry (GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods);
+ GdkModifierType accel_mods);
void gtk_accel_group_add (GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods,
+ GdkModifierType accel_mods,
GtkAccelFlags accel_flags,
GtkObject *object,
const gchar *accel_signal);
void gtk_accel_group_remove (GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods,
+ GdkModifierType accel_mods,
GtkObject *object);
/* Accelerator Signals
@@ -115,17 +115,17 @@ void gtk_accel_group_handle_add (GtkObject *object,
guint accel_signal_id,
GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods,
+ GdkModifierType accel_mods,
GtkAccelFlags accel_flags);
void gtk_accel_group_handle_remove (GtkObject *object,
GtkAccelGroup *accel_group,
guint accel_key,
- guint accel_mods);
+ GdkModifierType accel_mods);
guint gtk_accel_group_create_add (GtkType class_type,
- GtkSignalRunType run_type,
+ GtkSignalRunType signal_flags,
guint handler_offset);
guint gtk_accel_group_create_remove (GtkType class_type,
- GtkSignalRunType run_type,
+ GtkSignalRunType signal_flags,
guint handler_offset);
void gtk_accel_group_marshal_add (GtkObject *object,
GtkSignalFunc func,
@@ -144,15 +144,15 @@ GSList* gtk_accel_group_entries_from_object (GtkObject *object);
/* Accelerators
*/
-gboolean gtk_accelerator_valid (guint keyval,
- guint modifiers);
-void gtk_accelerator_parse (const gchar *accelerator,
- guint *accelerator_key,
- guint *accelerator_mods);
-gchar* gtk_accelerator_name (guint accelerator_key,
- guint accelerator_mods);
-void gtk_accelerator_set_default_mod_mask (guint default_mod_mask);
-guint gtk_accelerator_get_default_mod_mask (void);
+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);