[climacs-cvs] CVS update: climacs/gui.lisp

[Robert Strandh]

Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv13781

Modified Files:
	gui.lisp 
Log Message:
Simplified implementation of com-delete-window

Date: Mon Feb 21 08:58:40 2005
Author: rstrandh

Index: climacs/gui.lisp
diff -u climacs/gui.lisp:1.115 climacs/gui.lisp:1.116
--- climacs/gui.lisp:1.115	Mon Feb 21 08:47:26 2005
+++ climacs/gui.lisp	Mon Feb 21 08:58:39 2005
@@ -981,15 +981,11 @@
 	   (second (second children)))
       (pop (windows *application-frame*))
       (sheet-disown-child box other)
-      (cond ((eq box first)
-	     (sheet-disown-child parent box)
-	     (sheet-adopt-child parent other)
-	     (reorder-sheets parent (list other second)))
-	    (t
-	     (sheet-disown-child parent box)
-	     (sheet-adopt-child parent other)
-	     (reorder-sheets parent (list first other)))))))
-
+      (sheet-disown-child parent box)
+      (sheet-adopt-child parent other)
+      (reorder-sheets parent (if (eq box first)
+				 (list other second)
+				 (list first other))))))
 
 (define-named-command com-single-window ()
   (loop until (null (cdr (windows *application-frame*)))
@@ -1012,13 +1008,11 @@
 ;; 	   (third (third children)))
 ;;       (pop (windows *application-frame*))
 ;;       (sheet-disown-child box other)
+;;       (sheet-disown-child parent box)
+;; 	 (sheet-adopt-child parent other)
 ;;       (cond ((eq box first)
-;; 	     (sheet-disown-child parent box)
-;; 	     (sheet-adopt-child parent other)
 ;; 	     (reorder-sheets parent (list other second third)))
 ;; 	    (t
-;; 	     (sheet-disown-child parent box)
-;; 	     (sheet-adopt-child parent other)
 ;; 	     (reorder-sheets parent (list first second other)))))))
 
 ;;;;;;;;;;;;;;;;;;;;