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

same as before -Jay

Browse Source
This commit is contained in:
Jay Painter
1997-12-02 03:43:24 +00:00
parent 60ec6d4638
commit 1e4243e40b
14 changed files with 85 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/Makefile.am
View File

@ -179,7 +179,7 @@ gtkinclude_HEADERS = \
gtktypebuiltins.c: gtk.defs gentypeinfo.el
$(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@
libgtk_la_LDFLAGS = -version-info 1:0:
libgtk_la_LDFLAGS = -version-info 1:0:0
EXTRA_DIST = \
line-arrow.xbm \

2
gtk/Makefile.in
View File

@ -247,7 +247,7 @@ gtkinclude_HEADERS = \
gtkwindow.h \
gtktypebuiltins.h
libgtk_la_LDFLAGS = -version-info 1:0:
libgtk_la_LDFLAGS = -version-info 1:0:0
EXTRA_DIST = \
line-arrow.xbm \

20
gtk/gtknotebook.c
View File

@ -201,7 +201,8 @@ gtk_notebook_insert_page (GtkNotebook *notebook,
if (GTK_WIDGET_REALIZED (notebook) &&
!GTK_WIDGET_REALIZED (child))
gtk_widget_realize (child);
if (GTK_WIDGET_MAPPED (notebook) &&
!GTK_WIDGET_MAPPED (child) && notebook->cur_page == page)
gtk_widget_map (child);
@ -551,7 +552,7 @@ gtk_notebook_size_request (GtkWidget *widget,
if (GTK_WIDGET_VISIBLE (page->child))
{
gtk_widget_size_request (page->child, &page->child->requisition);
widget->requisition.width = MAX (widget->requisition.width,
page->child->requisition.width);
widget->requisition.height = MAX (widget->requisition.height,
@ -705,7 +706,7 @@ gtk_notebook_size_allocate (GtkWidget *widget,
{
page = children->data;
children = children->next;
if (GTK_WIDGET_VISIBLE (page->child))
gtk_widget_size_allocate (page->child, &child_allocation);
}
@ -1041,7 +1042,18 @@ gtk_notebook_switch_page (GtkNotebook *notebook,
gtk_notebook_pages_allocate (notebook, &GTK_WIDGET (notebook)->allocation);
if (GTK_WIDGET_MAPPED (notebook))
gtk_widget_map (notebook->cur_page->child);
{
if (GTK_WIDGET_REALIZED (notebook->cur_page->child))
{
gtk_widget_map (notebook->cur_page->child);
}
else
{
gtk_widget_map (notebook->cur_page->child);
gtk_widget_size_allocate (GTK_WIDGET (notebook),
&GTK_WIDGET (notebook)->allocation);
}
}
if (GTK_WIDGET_DRAWABLE (notebook))
gtk_widget_queue_draw (GTK_WIDGET (notebook));