summaryrefslogtreecommitdiff
path: root/gtk/gtkmenuitem.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-06-18 03:22:09 +0000
committerTim Janik <timj@src.gnome.org>1998-06-18 03:22:09 +0000
commitf83d57e91b6ffa2377d714f076343ac9e71b78c1 (patch)
treeae7428e1a0be53d24c94a645f01ca32eaecacfdc /gtk/gtkmenuitem.h
parent85adae970a84eaf5cb5d3ce8819044cb832e0d72 (diff)
downloadgtk+-f83d57e91b6ffa2377d714f076343ac9e71b78c1.tar.gz
yeppers, accelerator changes to fix the gimp. commit message dedicated to
yeppers, accelerator changes to fix the gimp. commit message dedicated to sopwith ;) Thu Jun 18 03:30:06 1998 Tim Janik <timj@gtk.org> * gtk/gtkaccellabel.h: * gtk/gtkaccellabel.c: new function gtk_accel_label_accelerator_width to request the size of the accelerator portion of an accel label. (gtk_accel_label_size_request): don't request for the accelerators size. (gtk_accel_label_expose_event): only draw the accelerator if we got enough extra space. * gtk/gtkmenuitem.c (gtk_menu_item_size_request): request accelerator width from children. * gtk/gtkmenu.c (gtk_menu_key_press): when adding an accelerator to an object (after removal has been requested) check if there is still an accelerator remaining to avoid adding two accelerators on an object. this can happen for locked accelerators (or accelerator-frozen widgets). (gtk_menu_size_request): feature childrens accelerator width in size requests. * gtk/gtknotebook.c (gtk_notebook_menu_item_create): use gtk_widget_freeze_accelerators() for dynamically created menu items. * gtk/gtksignal.h: * gtk/gtksignal.c: new function gtk_signal_handler_pending_by_func() which will return a handler_id > 0 if the specified function is pending for `signal_id'. * gtk/gtkwidget.h: * gtk/gtkwidget.c: remove gtk_widget_stop_accelerator, which was just a signal handler function to stop accelerator addition. added gtk_widget_freeze_accelerators and gtk_widget_thaw_accelerators which will prevent (undo) any accelerators from being added to or removed from a widget.
Diffstat (limited to 'gtk/gtkmenuitem.h')
-rw-r--r--gtk/gtkmenuitem.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 55529f2d87..82a9244fe0 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -48,6 +48,7 @@ struct _GtkMenuItem
guint accelerator_signal;
guint16 toggle_size;
+ guint16 accelerator_width;
guint show_toggle_indicator : 1;
guint show_submenu_indicator : 1;