Commit c5c75ece authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Put 1.3.1 in warning message, not 1.3.0.

Mon Jun 26 19:37:04 2000  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Put 1.3.1 in warning message, not 1.3.0.

        (Fixes problem with drawing childless frames. Pointed out
	by and a first patch from Anders)

	* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
	compute a child_allocation, even if we don't have a child.

	* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
	Always chain to the parent's impl, even if we don't have a child.
parent 2bb4bcff
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
Mon Jun 26 19:37:04 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Put 1.3.1 in warning message, not 1.3.0.
(Fixes problem with drawing childless frames. Pointed out
by and a first patch from Anders)
* gtk/gtkframe.c (gtk_frame_compute_child_allocation): Always
compute a child_allocation, even if we don't have a child.
* gtk/gtkaspectframe.c (gtk_aspect_frame_compute_child_allocation):
Always chain to the parent's impl, even if we don't have a child.
Mon Jun 26 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c: If possible, create only a single shm segment and
......
......@@ -279,7 +279,7 @@ if test x$with_glib = x ; then
AM_PATH_GLIB(1.3.1,,
AC_MSG_ERROR([
*** GLIB 1.3.0 or better is required. The latest version of GLIB
*** GLIB 1.3.1 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org/.]),
gobject gmodule gthread)
......
......@@ -282,4 +282,6 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame *frame,
child_allocation->x = full_allocation.x + aspect_frame->xalign * (full_allocation.width - child_allocation->width);
child_allocation->y = full_allocation.y + aspect_frame->yalign * (full_allocation.height - child_allocation->height);
}
else
parent_class->compute_child_allocation (frame, child_allocation);
}
......@@ -506,29 +506,27 @@ gtk_frame_size_allocate (GtkWidget *widget,
{
GtkFrame *frame = GTK_FRAME (widget);
GtkBin *bin = GTK_BIN (widget);
GtkAllocation new_allocation;
widget->allocation = *allocation;
gtk_frame_compute_child_allocation (frame, &new_allocation);
/* If the child allocation changed, that means that the frame is drawn
* in a new place, so we must redraw the entire widget.
*/
if (GTK_WIDGET_MAPPED (widget) &&
(new_allocation.x != frame->child_allocation.x ||
new_allocation.y != frame->child_allocation.y ||
new_allocation.width != frame->child_allocation.width ||
new_allocation.height != frame->child_allocation.height))
gtk_widget_queue_clear (widget);
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
GtkAllocation new_allocation;
gtk_frame_compute_child_allocation (frame, &new_allocation);
/* If the child allocation changed, that means that the frame is drawn
* in a new place, so we must redraw the entire widget.
*/
if (GTK_WIDGET_MAPPED (widget) &&
(new_allocation.x != frame->child_allocation.x ||
new_allocation.y != frame->child_allocation.y ||
new_allocation.width != frame->child_allocation.width ||
new_allocation.height != frame->child_allocation.height))
gtk_widget_queue_clear (widget);
gtk_widget_size_allocate (bin->child, &new_allocation);
frame->child_allocation = new_allocation;
}
gtk_widget_size_allocate (bin->child, &new_allocation);
frame->child_allocation = new_allocation;
if (frame->label_widget && GTK_WIDGET_VISIBLE (frame->label_widget))
{
GtkRequisition child_requisition;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment