AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #56586

Browse Source 
2001-10-04  Havoc Pennington  <hp@pobox.com>

        Fix #56586

	* gtk/gtksettings.c (gtk_settings_class_init): move the F10
	accelerator setting here...

	* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
	because we try to use it when a menu bar hasn't necessarily been
	initialized.
This commit is contained in:
Havoc Pennington 2001-10-04 06:48:09 +00:00 committed by Havoc Pennington
parent 739ffc4934
commit ced7a5fd8e
10 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
2001-10-04 Havoc Pennington <hp@pobox.com>
Fix #56586
* gtk/gtksettings.c (gtk_settings_class_init): move the F10
accelerator setting here...
* gtk/gtkmenubar.c (gtk_menu_bar_class_init): ...from over here,
because we try to use it when a menu bar hasn't necessarily been
initialized.
2001-10-03 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (logical_motion_tests): fix test case,

6
docs/reference/gtk/tmpl/gtkmenu.sgml
View File

@ -96,9 +96,9 @@ Creates a new #GtkMenu.
Adds a new #GtkMenuItem to the end of the menu's item list.
</para>
<!-- # Unused Parameters # -->
@menu: a #GtkMenu.
@child: The #GtkMenuItem to add.
<!-- # Unused Parameters # -->
@m:
@c:
@ -108,9 +108,9 @@ Adds a new #GtkMenuItem to the end of the menu's item list.
Adds a new #GtkMenuItem to the beginning of the menu's item list.
</para>
<!-- # Unused Parameters # -->
@menu: a #GtkMenu.
@child: The #GtkMenuItem to add.
<!-- # Unused Parameters # -->
@menu_child:
@m:
@c:
@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position
indicated by @position.
</para>
<!-- # Unused Parameters # -->
@menu: a #GtkMenu.
@child: The #GtkMenuItem to add.
@pos:
<!-- # Unused Parameters # -->
@position: The position in the item list where @child is added.
Positions are numbered from 0 to n-1.

6
gtk/gtkmenubar.c
View File

@ -142,12 +142,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
"move_current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
gtk_settings_install_property (g_param_spec_string ("gtk-menu-bar-accel",
_("Menu bar accelerator"),
_("Keybinding to activate the menu bar"),
"F10",
G_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_enum ("shadow_type",

15
gtk/gtksettings.c
View File

@ -28,7 +28,8 @@ enum {
PROP_CURSOR_BLINK_TIME,
PROP_SPLIT_CURSOR,
PROP_THEME_NAME,
PROP_KEY_THEME_NAME
PROP_KEY_THEME_NAME,
PROP_MENU_BAR_ACCEL
};
@ -187,7 +188,17 @@ gtk_settings_class_init (GtkSettingsClass *class)
NULL,
G_PARAM_READWRITE),
NULL);
g_assert (result == PROP_KEY_THEME_NAME);
g_assert (result == PROP_KEY_THEME_NAME);
result = settings_install_property_parser (class,
g_param_spec_string ("gtk-menu-bar-accel",
_("Menu bar accelerator"),
_("Keybinding to activate the menu bar"),
"F10",
G_PARAM_READWRITE),
NULL);
g_assert (result == PROP_MENU_BAR_ACCEL);
}
static void