Update of /project/closure/cvsroot/closure/src/gui
In directory common-lisp.net:/tmp/cvs-serv3807/src/gui
Modified Files:
clim-gui.lisp
Log Message:
Work around problems related to *closure-inited-p* (see #lisp logs for
2005-08-25 for more discussion). Not clear where the fault lies: sbcl,
clx, mcclim[-freetype] or closure itself.
Date: Thu Aug 25 17:05:48 2005
Author: crhodes
Index: closure/src/gui/clim-gui.lisp
diff -u closure/src/gui/clim-gui.lisp:1.20 closure/src/gui/clim-gui.lisp:1.21
--- closure/src/gui/clim-gui.lisp:1.20 Mon Jul 11 17:58:03 2005
+++ closure/src/gui/clim-gui.lisp Thu Aug 25 17:05:48 2005
@@ -4,7 +4,7 @@
;;; Created: 2002-07-22
;;; Author: Gilbert Baumann <gilbert(a)base-engineering.com>
;;; License: MIT style (see below)
-;;; $Id: clim-gui.lisp,v 1.20 2005/07/11 15:58:03 crhodes Exp $
+;;; $Id: clim-gui.lisp,v 1.21 2005/08/25 15:05:48 crhodes Exp $
;;; ---------------------------------------------------------------------------
;;; (c) copyright 2002 by Gilbert Baumann
@@ -28,6 +28,11 @@
;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
;; $Log: clim-gui.lisp,v $
+;; Revision 1.21 2005/08/25 15:05:48 crhodes
+;; Work around problems related to *closure-inited-p* (see #lisp logs for
+;; 2005-08-25 for more discussion). Not clear where the fault lies: sbcl,
+;; clx, mcclim[-freetype] or closure itself.
+;;
;; Revision 1.20 2005/07/11 15:58:03 crhodes
;; Complete the renaming *MEDIUM* -> *PANE*.
;;
@@ -453,19 +458,18 @@
(send-closure-command 'com-quit))))
(defvar *closure-inited-p* nil)
-(defmethod clim:run-frame-top-level :before ((frame closure)
- &key &allow-other-keys)
- (setf *closure-inited-p* t))
+(defmethod clim:read-frame-command :before ((frame closure)
+ &key &allow-other-keys)
+ (unless *closure-inited-p*
+ (setf *closure-inited-p* t)))
(defun ensure-closure ()
(with-closure ()
(unless *closure-process*
(setf *closure-inited-p* nil)
(run-closure)
- (clim-sys:process-wait "Waiting for closure init"
- (lambda ()
- *closure-inited-p*)))))
-
+ (clim-sys:process-wait "Waiting for closure init"
+ (lambda () *closure-inited-p*)))))
(defun run-closure ()
;; Care for proxy