diff options
author | Tim Janik <timj@gtk.org> | 1998-06-07 06:48:56 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1998-06-07 06:48:56 +0000 |
commit | a391196ba51da34253593712e8bf4552c04f19e5 (patch) | |
tree | 50c2edfc5d066467f3c33c1f82c89dd9923c44c4 /gtk/gtkaccelgroup.h | |
parent | f522f36dd1c484b133ba6b04027667aa9144ad04 (diff) | |
download | gtk+-a391196ba51da34253593712e8bf4552c04f19e5.tar.gz |
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
Diffstat (limited to 'gtk/gtkaccelgroup.h')
-rw-r--r-- | gtk/gtkaccelgroup.h | 164 |
1 files changed, 164 insertions, 0 deletions
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h new file mode 100644 index 0000000000..7b72860fd1 --- /dev/null +++ b/gtk/gtkaccelgroup.h @@ -0,0 +1,164 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * GtkAccelGroup: Accelerator manager for GtkObjects. + * Copyright (C) 1998 Tim Janik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#ifndef __GTK_ACCEL_GROUP_H__ +#define __GTK_ACCEL_GROUP_H__ + + +#include <gdk/gdk.h> +#include <gtk/gtkobject.h> +#include <gtk/gtkenums.h> + + +#ifdef __cplusplus +extern "C" { +#pragma } +#endif /* __cplusplus */ + + +typedef struct _GtkAccelGroup GtkAccelGroup; +typedef struct _GtkAccelEntry GtkAccelEntry; + +/* enum GtkAccelFlags: + * + * GTK_ACCEL_VISIBLE - should the accelerator appear in + * the widget's display? + * GTK_ACCEL_SIGNAL_VISIBLE - should the signal associated + * with this accelerator be also visible? + * GTK_ACCEL_LOCKED - may the accelerator be removed again? + */ + +struct _GtkAccelGroup +{ + guint ref_count; + guint lock_count; + guint modifier_mask; + GSList *attach_objects; +}; + +struct _GtkAccelEntry +{ + /* key portion + */ + GtkAccelGroup *accel_group; + guint accelerator_key; + guint accelerator_mods; + + GtkAccelFlags accel_flags; + GtkObject *object; + guint signal_id; +}; + + +/* 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, + guint accel_key, + guint accel_mods); +gboolean gtk_accel_groups_activate (GtkObject *object, + guint accel_key, + guint 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 + */ +GtkAccelEntry* gtk_accel_group_get_entry (GtkAccelGroup *accel_group, + guint accel_key, + guint accel_mods); +void gtk_accel_group_lock_entry (GtkAccelGroup *accel_group, + guint accel_key, + guint accel_mods); +void gtk_accel_group_unlock_entry (GtkAccelGroup *accel_group, + guint accel_key, + guint accel_mods); +void gtk_accel_group_add (GtkAccelGroup *accel_group, + guint accel_key, + guint 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, + GtkObject *object); + +/* Accelerator Signals + */ +void gtk_accel_group_handle_add (GtkObject *object, + guint accel_signal_id, + GtkAccelGroup *accel_group, + guint accel_key, + guint accel_mods, + GtkAccelFlags accel_flags); +void gtk_accel_group_handle_remove (GtkObject *object, + GtkAccelGroup *accel_group, + guint accel_key, + guint accel_mods); +guint gtk_accel_group_create_add (GtkType class_type, + GtkSignalRunType run_type, + guint handler_offset); +guint gtk_accel_group_create_remove (GtkType class_type, + GtkSignalRunType run_type, + guint handler_offset); +void gtk_accel_group_marshal_add (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args); +void gtk_accel_group_marshal_remove (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args); + +/* Miscellaneous + */ +GSList* gtk_accel_groups_from_object (GtkObject *object); +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); + + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* __GTK_ACCEL_GROUP_H__ */ |