diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtklabel.c | 2 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 450f114ac..df8dd74cd 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -668,7 +668,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget, parent = widget->parent; if (parent && GTK_IS_NOTEBOOK (parent)) - return gtk_widget_mnemonic_activate (parent, group_cycling); + return FALSE; while (parent) { diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 962dc26bf..6c3466c2f 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -4494,6 +4494,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, if (page->tab_label == tab_label) return; + gtk_notebook_remove_tab_label (notebook, page); if (tab_label) @@ -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)) { gtk_widget_show (page->tab_label); |