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

clim/pkg.lisp, clim/sysdcl.lisp, misc/go-ol.lisp, misc/go-xm.lisp,

misc/go.lisp, silica/pkg.lisp, silica/sysdcl.lisp,
tk-silica/sysdcl.lisp, xlib/sysdcl.lisp
- REMOVED all these files - they were historic.

clim/accept-values.lisp, clim/db-menu-lisp, clim/default-frame.lisp,
clim/menus.lisp
- changed :parent to :frame-manager in calls to make-application-frame

clim/db-stream.lisp
- make-clim-stream-pane passes the pane-name to the outlining-pane and
scroller-pane. This makes pane specific color resources affect the
scroll bars and border.

clim/frames.lisp
- simplified initialize-instance :after method on
standard-application-frame. Dropped the :parent initarg - all done
with the :frame-manager initarg.
- changed :command-menu panes to use tk menu-bar rather than clim1.1
style panes


clim/output-protocol.lisp
- output-protocol-mixin now inherits foreground, background and
text-style slots from sheet-with-resources-mixin
- output-protocol-mixin specific accessors on medium-foreground,
medium-background and medium-default-text-style removed.
- output-protcol-mixin specific engraft-medium method removed.

misc/compile-1.lisp
- tidied up compile-it.

silica/db-border.lisp, silica/db-layout.lisp, silica/db-scroll.lisp,
silica/scroll-pane.lisp, silica/gadgets.lisp, tk-silica/xm-gadgets.lisp
- changed all references to foreground-background-and-text-style-mixin
to sheet-with-resources-mixin

silica/gadgets.lisp
- made menu-bar inherit from sheet-with-resources-mixin and removed
its text-style slot

silica/medium.lisp
- removed foreground-background-and-text-style-mixin
- added sheet-with-resources-mixin
- added new gf get-sheet-resources to do resource lookup
- added new note-sheet-grafted :before method on
sheet-with-resources-mixin which does the resource lookup
- added engraft-medium :after method on sheet-with-resources-mixin

silica/sheet.lisp
- replaced note-sheet-grafted :around method hack with :after methods
on (setf port), this ensures the medium is engrafted after the mirror
has been realized.
- ditto for note-sheet-degrafted to degraft the medium

tk/widget.lisp tk/xlib.lisp
- changed resource name and class to be a list of strings rather than
a single string with "."s as separators.

tk-silica/xm-frames.lisp
- removed special handling (hack) of text-style for motif menu-bars.
The general sheet-with-resources-mixin mechanism deals with this now.

tk-silica/xm-gadgets.lisp
- removed hack in find-widget-class-and-initargs-for-sheet for
xm-viewport which named the widget according to the pane name of its
child. This is now handled correctly in make-clim-stream-pane
- made motif-scroller-pane set up the background of it's viewport
correctly. (Makes displays less "flashy")

tk-silica/xt-gadgets.lisp
- changed find-widget-class-and-initargs-for-sheet :around method from
foreground-background-and-text-style-mixin to sheet-with-resources-mixin
new method simply looks at the slots in the sheet (no database query)

tk-silica/xt-graphics.lisp
- replaced decode-ink + :around method by decode-ink and decode-ink-1
(to handle recursive case and not put multiple entries in hashtable)

tk-silica/xt-silica.lisp
- removed all the engraft-medium :before methods which called
default-from-resources.
- removed default-from-resources
- added get-sheet-resources methods on sheet and pixmap-stream
- added function get-xt-resources

utils/packages.lisp
- removed export of foreground-background-and-text-style-mixin
- exported get-sheet-resources from clim-silica
- exported sheet-with-resources-mixin from clim-silica
parent 32c174a7
No related branches found
No related tags found
No related merge requests found
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*-
;; $fiHeader: db-menu.lisp,v 1.5 92/11/19 14:17:17 cer Exp $
;; $fiHeader: db-menu.lisp,v 1.6 92/12/03 10:26:19 cer Exp $
"Copyright (c) 1992 by Symbolics, Inc. All rights reserved."
......@@ -198,7 +198,7 @@
(defun make-pull-down-menu (&key port)
(let ((frame (make-application-frame 'pull-down-menu-frame
:parent port
:frame-manager (find-frame-manager :port port)
:save-under t)))
(values (slot-value frame 'menu) frame)))
......
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
;; $fiHeader: default-frame.lisp,v 1.4 92/10/02 15:19:22 cer Exp $
;; $fiHeader: default-frame.lisp,v 1.5 92/12/03 10:26:27 cer Exp $
(in-package :clim-internals)
......@@ -15,7 +15,7 @@
(:top-level nil))
(defvar *default-application-frame*
(make-application-frame 'default-application :parent nil))
(make-application-frame 'default-application :frame-manager nil))
;; We keep a global binding of *APPLICATION-FRAME* because it can make
;; life easier for people debugging applications
......
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*-
;; $fiHeader: sheet.lisp,v 1.34 92/12/16 16:49:48 cer Exp $
;; $fiHeader: sheet.lisp,v 1.35 93/02/08 15:57:40 cer Exp $
(in-package :silica)
......@@ -420,29 +420,24 @@
(when medium
(invalidate-cached-transformations medium))))
(defclass permanent-medium-sheet-output-mixin (sheet-with-medium-mixin) ())
(defmethod note-sheet-grafted :around ((sheet permanent-medium-sheet-output-mixin))
;; By making this an :AROUND method we make sure that the mirror has
;; been realized at this point, if it's a mirrored sheet. This is pretty
;; horrible but it makes sure that things happen in the right order.
(call-next-method)
(defmethod (setf port) :after
((port basic-port) (sheet permanent-medium-sheet-output-mixin) &key)
(let ((medium-type (sheet-medium-type sheet)))
(when medium-type
(setf (sheet-medium sheet)
(if (mediump medium-type)
medium-type
(make-medium (port sheet) sheet)))
(when (port sheet)
(engraft-medium (sheet-medium sheet) (port sheet) sheet)))))
(if (mediump medium-type)
medium-type
(make-medium port sheet)))
(engraft-medium (sheet-medium sheet) (port sheet) sheet))))
(defmethod note-sheet-degrafted ((sheet permanent-medium-sheet-output-mixin))
(defmethod (setf port) :after
((port null) (sheet permanent-medium-sheet-output-mixin) &key)
(when (sheet-medium sheet)
(degraft-medium (sheet-medium sheet) (port sheet) sheet)
(degraft-medium (sheet-medium sheet) port sheet)
(setf (sheet-medium sheet) nil)))
(defclass temporary-medium-sheet-output-mixin (sheet-with-medium-mixin) ())
;; One medium is shared among several closely related sheets (such as
......@@ -452,8 +447,8 @@
(defclass shared-medium-sheet-output-mixin (sheet-with-medium-mixin)
((shared-medium-sheet :initform nil :initarg :shared-medium-sheet)))
(defmethod note-sheet-grafted :around ((sheet shared-medium-sheet-output-mixin))
(call-next-method)
(defmethod (setf port) :after
((port basic-port) (sheet shared-medium-sheet-output-mixin) &key)
(with-slots (shared-medium-sheet) sheet
(when shared-medium-sheet
(setf (sheet-medium sheet) (sheet-medium shared-medium-sheet)))))
......
......@@ -20,7 +20,7 @@
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;;
;; $fiHeader: widget.lisp,v 1.27 92/12/14 15:04:04 cer Exp $
;; $fiHeader: widget.lisp,v 1.28 93/01/11 15:45:51 colin Exp $
(in-package :tk)
......@@ -278,12 +278,12 @@
(defun xt-class (w) (char*-to-string (xt-class-name (xt_class w))))
(defun widget-resource-name-and-class (w)
(do* ((name "" (concatenate 'string (xt-name w) "." name))
(class "" (concatenate 'string (xt-class w) "." class))
(do* ((names nil (cons (xt-name w) names))
(classes nil (cons (xt-class w) classes))
(w w parent)
(parent (widget-parent w) (widget-parent w)))
((null parent)
(multiple-value-bind (app-name app-class)
(get-application-name-and-class (widget-display w))
(values (concatenate 'string app-name "." name)
(concatenate 'string app-class "." class))))))
(values (cons app-name names)
(cons app-class classes))))))
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