diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | glib/configure | 2 | ||||
| -rw-r--r-- | glib/configure.in | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/Makefile.in | 2 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 20 |
14 files changed, 85 insertions, 10 deletions
@@ -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 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e8c32f006..d38fb3643 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e8c32f006..d38fb3643 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e8c32f006..d38fb3643 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e8c32f006..d38fb3643 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e8c32f006..d38fb3643 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e8c32f006..d38fb3643 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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 @@ -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; } diff --git a/configure.in b/configure.in index c1140ac16..63a82b4a1 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/glib/configure b/glib/configure index becb1c703..7910385de 100755 --- a/glib/configure +++ b/glib/configure @@ -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; } diff --git a/glib/configure.in b/glib/configure.in index d97b441bc..b96aa7653 100644 --- a/glib/configure.in +++ b/glib/configure.in @@ -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) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 60d43b1d2..41b662562 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -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 \ diff --git a/gtk/Makefile.in b/gtk/Makefile.in index ee479c2a0..3bdbb6b0c 100644 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -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 \ diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 0b3115034..721671e4e 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -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, >K_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), + >K_WIDGET (notebook)->allocation); + } + } if (GTK_WIDGET_DRAWABLE (notebook)) gtk_widget_queue_draw (GTK_WIDGET (notebook)); |