mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-20 05:50:11 +00:00
fix figuring accel path and changing behaviour.
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org> * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
This commit is contained in:
parent
aa18bbf0ed
commit
f42cc7f7fb
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -1,3 +1,7 @@
|
||||
Wed Feb 13 13:26:39 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
|
||||
|
||||
Wed Feb 13 06:42:37 2002 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
|
||||
|
@ -259,7 +259,7 @@ gtk_menu_class_init (GtkMenuClass *class)
|
||||
gtk_settings_install_property (g_param_spec_boolean ("gtk-can-change-accels",
|
||||
_("Can change accelerators"),
|
||||
_("Whether menu accelerators can be changed by pressing a key over the menu item."),
|
||||
FALSE,
|
||||
TRUE,
|
||||
G_PARAM_READWRITE));
|
||||
}
|
||||
|
||||
@ -1767,8 +1767,7 @@ gtk_menu_key_press (GtkWidget *widget,
|
||||
}
|
||||
|
||||
g_object_get (G_OBJECT (gtk_settings_get_default ()),
|
||||
"gtk-can-change-accels",
|
||||
&can_change_accels,
|
||||
"gtk-can-change-accels", &can_change_accels,
|
||||
NULL);
|
||||
|
||||
accel_key = event->keyval;
|
||||
@ -1785,9 +1784,7 @@ gtk_menu_key_press (GtkWidget *widget,
|
||||
gboolean replace_accels = TRUE;
|
||||
const gchar *path;
|
||||
|
||||
path = GTK_MENU_ITEM (menu_item)->accel_path;
|
||||
if (!path)
|
||||
path = _gtk_widget_get_accel_path (menu_item);
|
||||
path = _gtk_widget_get_accel_path (menu_item);
|
||||
if (!path)
|
||||
{
|
||||
/* can't change accelerators on menu_items without paths
|
||||
|
Loading…
Reference in New Issue
Block a user