Fix errors in computing the size of the second child.

Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
        in computing the size of the second child.

9 files changed, 37 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index db97d43c16..94d70b720f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index db97d43c16..94d70b720f 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db97d43c16..94d70b720f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index db97d43c16..94d70b720f 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index db97d43c16..94d70b720f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db97d43c16..94d70b720f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db97d43c16..94d70b720f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Dec  6 23:09:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
+	in computing the size of the second child.
+
 Thu Dec  6 16:50:17 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Make button 1 clicks on the trough
diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index f2a30b1826..196ca41277 100644
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -196,7 +196,7 @@ gtk_hpaned_size_allocate (GtkWidget     *widget,
       child1_allocation.y = child2_allocation.y = widget->allocation.y + border_width;
       
       child2_allocation.x = child1_allocation.x + child1_allocation.width +  paned->handle_pos.width;
-      child2_allocation.width = MAX (1, (gint) allocation->width - child2_allocation.x - border_width);
+      child2_allocation.width = MAX (1, widget->allocation.x + widget->allocation.width - child2_allocation.x - border_width);
       
       /* Now allocate the childen, making sure, when resizing not to
        * overlap the windows
diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index 3951f76b3f..5cfd4b6981 100644
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -196,7 +196,7 @@ gtk_vpaned_size_allocate (GtkWidget     *widget,
       child1_allocation.y = widget->allocation.y + border_width;
       
       child2_allocation.y = child1_allocation.y + child1_allocation.height + paned->handle_pos.height;
-      child2_allocation.height = MAX (1, (gint) allocation->height - child2_allocation.y - border_width);
+      child2_allocation.height = MAX (1, widget->allocation.y + widget->allocation.height - child2_allocation.y - border_width);
       
       /* Now allocate the childen, making sure, when resizing not to
        * overlap the windows