summaryrefslogtreecommitdiff
path: root/gtk/gtknotebook.c
diff options
context:
space:
mode:
authorLars Hamann <lars@gtk.org>1999-01-23 01:04:33 +0000
committerLars Hamann <lars@src.gnome.org>1999-01-23 01:04:33 +0000
commitf37d395c4f7a16d07c1710815d0b2acbbd1548c8 (patch)
tree139913d0c21e6986a9fcbe9bd0bc6e609384f9d1 /gtk/gtknotebook.c
parentad987142c1aa9277f9dfa8ec9d86d646ef3db298 (diff)
downloadgdk-pixbuf-f37d395c4f7a16d07c1710815d0b2acbbd1548c8.tar.gz
removed extra gtk_spin_button_update calls again. unblock dnd signal
Sat Jan 23 01:44:43 1999 Lars Hamann <lars@gtk.org> * gtk/gtkspinbutton.c (gtk_spin_button_get_value_as_int) (gtk_spin_button_get_value_as_float): removed extra gtk_spin_button_update calls again. * gtk/gtkclist.c (gtk_clist_unmap): unblock dnd signal handler if neccessary * gtk/gtknotebook.c (gtk_notebook_button_press): grab_focus before switch_page (gtk_notebook_set_shape): don't use cur_page if it's NULL.
Diffstat (limited to 'gtk/gtknotebook.c')
-rw-r--r--gtk/gtknotebook.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index b2a5a387b..2aa826499 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1071,8 +1071,8 @@ gtk_notebook_button_press (GtkWidget *widget,
else
{
gtk_notebook_switch_focus_tab (notebook, children);
- gtk_notebook_switch_page (notebook, page, num);
gtk_widget_grab_focus (widget);
+ gtk_notebook_switch_page (notebook, page, num);
}
break;
}
@@ -2477,7 +2477,11 @@ gtk_notebook_set_shape (GtkNotebook *notebook)
}
else
{
- page = notebook->cur_page;
+ if (notebook->cur_page)
+ page = notebook->cur_page;
+ else
+ page = notebook->children->data;
+
if (!GTK_WIDGET_MAPPED (page->tab_label))
{
if (notebook->tab_pos == GTK_POS_LEFT)