Skip to content
Snippets Groups Projects
Commit fad1e054 authored by colin's avatar colin
Browse files

see changelog for Fri Sep 17 11:34:06 PDT 1993

parent 45e413b4
No related branches found
No related tags found
No related merge requests found
from colin: Fri Sep 17 11:34:06 PDT 1993
demo/demo-driver.lisp
demo/demo-activity.lisp fixed problem activity demo
-------------------------------------------------------------------------------
Thu Sep 16 22:26:58 1993 Duane Rettig (duane at clay) Thu Sep 16 22:26:58 1993 Duane Rettig (duane at clay)
* Makefile.defs: Parameterize composer CL_SRC directory * Makefile.defs: Parameterize composer CL_SRC directory
...@@ -12,6 +19,8 @@ Thu Sep 16 22:26:58 1993 Duane Rettig (duane at clay) ...@@ -12,6 +19,8 @@ Thu Sep 16 22:26:58 1993 Duane Rettig (duane at clay)
* misc/dev-load-1.lisp: Set update-entry-points to nil for speed * misc/dev-load-1.lisp: Set update-entry-points to nil for speed
-------------------------------------------------------------------------------
from colin: Thu Sep 16 17:17:55 PDT 1993 from colin: Thu Sep 16 17:17:55 PDT 1993
clim/completer.lisp fix to clim2bug600 clim/completer.lisp fix to clim2bug600
......
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*- ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
;; $fiHeader: demo-activity.lisp,v 1.7 1993/06/04 16:06:29 cer Exp $ ;; $fiHeader: demo-activity.lisp,v 1.8 1993/09/17 00:20:28 colin Exp $
(in-package :clim-demo) (in-package :clim-demo)
...@@ -71,4 +71,4 @@ ...@@ -71,4 +71,4 @@
(define-demo "Activity Demo" activity-frame) (define-demo "Activity Demo" demo-activity)
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*- ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
;; $fiHeader: demo-driver.lisp,v 1.24 1993/07/27 01:45:21 colin Exp $ ;; $fiHeader: demo-driver.lisp,v 1.25 1993/09/17 00:20:30 colin Exp $
(in-package :clim-demo) (in-package :clim-demo)
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
(defmacro define-demo (name class &rest initargs) (defmacro define-demo (name class &rest initargs)
(let ((do-name (clim-utils:fintern "~A-~A" 'do class))) (let ((do-name (clim-utils:fintern "~A-~A" 'do class)))
`(let ((demo (make-instance 'demo :name ,name `(let ((demo (make-instance 'demo
:class ',class :initargs ',initargs))) :name ,name :class ',class :initargs ',initargs)))
(clim-utils:push-unique demo (clim-utils:push-unique demo
*demos* :test #'string-equal :key #'demo-name) *demos* :test #'string-equal :key #'demo-name)
(defun ,do-name (&rest args) (defun ,do-name (&rest args)
(apply #'run-demo demo args))))) (apply #'run-demo demo args)))))
...@@ -66,25 +66,27 @@ ...@@ -66,25 +66,27 @@
(defun run-demo (demo &key (port (find-port)) force) (defun run-demo (demo &key (port (find-port)) force)
(let* ((entry (assoc port (demo-frames demo))) (let* ((entry (assoc port (demo-frames demo)))
(frame (cdr entry))) (frame (cdr entry))
(activity-p (subtypep (demo-class demo) 'activity)))
(when (or force (null frame)) (when (or force (null frame))
(setq frame (apply #'make-application-frame (setq frame (apply (if activity-p
#'make-instance
#'make-application-frame)
(demo-class demo) (demo-class demo)
:frame-manager (find-frame-manager :port port) :frame-manager (find-frame-manager :port port)
(demo-initargs demo)))) (demo-initargs demo))))
(if entry (if entry
(setf (cdr entry) frame) (setf (cdr entry) frame)
(push (cons port frame) (demo-frames demo))) (push (cons port frame) (demo-frames demo)))
(case (frame-state frame) (if (slot-value frame 'clim-internals::top-level-process)
((:enabled :shrunk) (unless activity-p
(note-frame-deiconified (frame-manager frame) frame) (note-frame-deiconified (frame-manager frame) frame)
(raise-frame frame)) (raise-frame frame))
(t (run-frame-top-level frame))))
(run-frame-top-level frame)))))
(let ((demo (make-instance 'demo
(let ((demo (make-instance 'demo :name "Demo Driver" :name "Demo Driver" :class 'demo-driver
:class 'demo-driver :initargs '(:left 0 :top 0))))
:initargs '(:left 0 :top 0))))
(defun start-demo (&rest args) (defun start-demo (&rest args)
(apply #'run-demo demo args))) (apply #'run-demo demo args)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment