Commit 59bdb19b authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

keep in sync with insert_page_menu. Code duplication is bad.

Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
	with insert_page_menu.  Code duplication is bad.

	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
	wrong fix yesterday.
parent a4d12691
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
Wed Dec 12 15:01:33 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
with insert_page_menu. Code duplication is bad.
* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
wrong fix yesterday.
Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com> Wed Dec 12 14:27:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (window_key_press_handler): Fix check for * gtk/gtkmenubar.c (window_key_press_handler): Fix check for
......
...@@ -668,7 +668,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget, ...@@ -668,7 +668,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
parent = widget->parent; parent = widget->parent;
if (parent && GTK_IS_NOTEBOOK (parent)) if (parent && GTK_IS_NOTEBOOK (parent))
return gtk_widget_mnemonic_activate (parent, group_cycling); return FALSE;
while (parent) while (parent)
{ {
......
...@@ -4494,6 +4494,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, ...@@ -4494,6 +4494,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
if (page->tab_label == tab_label) if (page->tab_label == tab_label)
return; return;
gtk_notebook_remove_tab_label (notebook, page); gtk_notebook_remove_tab_label (notebook, page);
if (tab_label) if (tab_label)
...@@ -4518,6 +4519,13 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, ...@@ -4518,6 +4519,13 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
} }
} }
if (page->tab_label)
page->mnemonic_activate_signal =
gtk_signal_connect (GTK_OBJECT (page->tab_label),
"mnemonic_activate",
(GtkSignalFunc) gtk_notebook_mnemonic_activate_switch_page,
notebook);
if (notebook->show_tabs && GTK_WIDGET_VISIBLE (child)) if (notebook->show_tabs && GTK_WIDGET_VISIBLE (child))
{ {
gtk_widget_show (page->tab_label); gtk_widget_show (page->tab_label);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment