same as before -Jay

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

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

View File

@ -1,3 +1,12 @@
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
which were not displayed when the notebook widget was realized were
never size allocated when they were realized.
Thr Nov 28 1997 Jay Painter <jpaint@serv.net>
* gtk/gtklist.h: removed GtkSelectionMode
* gtk/gtkenums.h: added GtkSelectionMode
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before

2
configure vendored
View File

@ -631,7 +631,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
PACKAGE=gtk+
VERSION=971109
VERSION=971201
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

View File

@ -5,7 +5,7 @@ AC_INIT(gdk/gdktypes.h)
AC_CONFIG_SUBDIRS(glib)
dnl Initialize automake stuff
AM_INIT_AUTOMAKE(gtk+, 971109)
AM_INIT_AUTOMAKE(gtk+, 971201)
# Specify a configuration file
AM_CONFIG_HEADER(config.h)

2
glib/configure vendored
View File

@ -617,7 +617,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
PACKAGE=glib
VERSION=971109
VERSION=971201
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

View File

@ -2,7 +2,7 @@
AC_INIT(glib.h)
dnl Initialize automake stuff
AM_INIT_AUTOMAKE(glib, 971109)
AM_INIT_AUTOMAKE(glib, 971201)
# Specify a configuration file
AM_CONFIG_HEADER(glibconfig.h)

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 \

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 \

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));