From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Thu, 6 Oct 2011 20:24:38 +0000 (-0700)
Subject: Chain up fix-resizers via their new "before" and "after" slots.
X-Git-Tag: mit-scheme-pucked-9.2.12~366^2~81
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=62146f251008fce915cc4079e5a9a91ddf1b5749;p=mit-scheme.git

Chain up fix-resizers via their new "before" and "after" slots.
---

diff --git a/src/gtk-screen/gtk-screen.pkg b/src/gtk-screen/gtk-screen.pkg
index 496da8be5..f3041b5fd 100644
--- a/src/gtk-screen/gtk-screen.pkg
+++ b/src/gtk-screen/gtk-screen.pkg
@@ -174,7 +174,8 @@ USA.
 
 	  fix-resizer?
 	  make-fix-resizer
-	  fix-resizer-resizee set-fix-resizer-resizee!
+	  fix-resizer-before set-fix-resizer-before!
+	  fix-resizer-after set-fix-resizer-after!
 
 	  <fix-drawing> guarantee-fix-drawing
 	  make-fix-drawing fix-drawing-widgets
diff --git a/src/gtk-screen/gtk-screen.scm b/src/gtk-screen/gtk-screen.scm
index a049d2c95..9583d1c82 100644
--- a/src/gtk-screen/gtk-screen.scm
+++ b/src/gtk-screen/gtk-screen.scm
@@ -800,8 +800,8 @@ USA.
     ;; resizer (if needed), then tail-call re-pack-windows! on the
     ;; rest.
     (if (and resizer
-	     (not (eq? (car widgets) (fix-resizer-resizee resizer))))
-	(set-fix-resizer-resizee! resizer (car widgets)))
+	     (not (eq? (car widgets) (fix-resizer-before resizer))))
+	(set-fix-resizer-before! resizer (car widgets)))
 
     (if (and (gtk-hbox? box) (pair? (cdr windows)))
 	;; Need resizer.
@@ -811,6 +811,7 @@ USA.
 	  (if resizer
 	      (re-pack-windows! (cdr windows) (cddr widgets) box resizer prefix)
 	      (let ((new (make-fix-resizer (gtk-screen-char-width screen) -1)))
+		(set-fix-resizer-after! new box)
 		(gtk-box-pack-end box new #f #f 0)
 		(for-each
 		  (lambda (w)
@@ -855,11 +856,12 @@ USA.
 	    (pack-new! (%reversed-children (car windows)) new #f new-prefix)
 	    (gtk-box-pack-end box new #t #t 0)
 	    (%trace ";     "prefix"packed "new" in "box"\n")
-	    (if resizer (set-fix-resizer-resizee! resizer new))
+	    (if resizer (set-fix-resizer-before! resizer new))
 	    (if (and (gtk-hbox? box) (pair? (cdr windows)))
 		;; Need resizer.
 		(let ((new-resizer
 		       (make-fix-resizer (gtk-screen-char-width screen) -1)))
+		  (set-fix-resizer-after! new-resizer new)
 		  (gtk-box-pack-end box new-resizer #f #f 0)
 		  (pack-new! (cdr windows) box new-resizer prefix))
 		;; Need NO resizer.
@@ -900,11 +902,12 @@ USA.
 		  (gtk-box-pack-end vbox scroller #t #t 0)
 		  (gtk-box-pack-end box vbox #t #t 0)
 		  (%trace ";     "prefix"packed "vbox" into "box"\n")))
-	    (if resizer (set-fix-resizer-resizee! resizer vbox))
+	    (if resizer (set-fix-resizer-before! resizer vbox))
 	    (if (and (gtk-hbox? box) (pair? (cdr windows)))
 		;; Need resizer.
 		(let ((new-resizer
 		       (make-fix-resizer (gtk-screen-char-width screen) -1)))
+		  (set-fix-resizer-after! new-resizer vbox)
 		  (gtk-box-pack-end box new-resizer #f #f 0)
 		  (pack-new! (cdr windows) box new-resizer prefix))
 		;; Need NO resizer.