callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merges from gtk-1-2

Browse Source
This commit is contained in:
Owen Taylor
2000-03-14 19:57:25 +00:00
parent 3f98a849c7
commit 10ba4fd066
98 changed files with 3772 additions and 1749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtknotebook.c
View File

@ -514,8 +514,8 @@ gtk_notebook_map (GtkWidget *widget)
page = children->data;
children = children->next;
if (page->tab_label &&
GTK_WIDGET_VISIBLE (page->child) &&
if (page->tab_label &&
GTK_WIDGET_VISIBLE (page->tab_label) &&
!GTK_WIDGET_MAPPED (page->tab_label))
gtk_widget_map (page->tab_label);
}
@ -803,6 +803,17 @@ gtk_notebook_size_request (GtkWidget *widget,
}
}
}
else
{
for (children = notebook->children; children;
children = children->next)
{
page = children->data;
if (page->tab_label && GTK_WIDGET_VISIBLE (page->tab_label))
gtk_widget_hide (page->tab_label);
}
}
}
widget->requisition.width += GTK_CONTAINER (widget)->border_width * 2;