[mcclim-cvs] CVS mcclim
ahefner
ahefner at common-lisp.net
Tue Dec 19 04:02:14 UTC 2006
Update of /project/mcclim/cvsroot/mcclim
In directory clnet:/tmp/cvs-serv18028
Modified Files:
panes.lisp text-editor-gadget.lisp
Log Message:
In make-pane, convert keyword types to their corresponding symbols in the
CLIM package.
--- /project/mcclim/cvsroot/mcclim/panes.lisp 2006/12/05 02:08:44 1.174
+++ /project/mcclim/cvsroot/mcclim/panes.lisp 2006/12/19 04:02:14 1.175
@@ -27,7 +27,7 @@
;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;;; Boston, MA 02111-1307 USA.
-;;; $Id: panes.lisp,v 1.174 2006/12/05 02:08:44 rgoldman Exp $
+;;; $Id: panes.lisp,v 1.175 2006/12/19 04:02:14 ahefner Exp $
(in-package :clim-internals)
@@ -377,6 +377,10 @@
(prin1 (pane-name pane) sink)))
(defun make-pane (type &rest args)
+ (when (eql (symbol-package type)
+ (symbol-package :foo))
+ (setf type (or (find-symbol (symbol-name type) (find-package :clim))
+ type)))
(apply #'make-pane-1 *pane-realizer* *application-frame* type args))
(defmethod medium-foreground ((pane pane))
@@ -2095,7 +2099,7 @@
(check-type scroll-bar scroll-bar-spec) ; (member :vertical :horizontal :both t nil))
(when (member scroll-bar '(:vertical :both t))
(setq vscrollbar
- (make-pane 'scroll-bar-pane
+ (make-pane 'scroll-bar
:orientation :vertical
:client (first (sheet-children viewport))
:drag-callback (lambda (gadget new-value)
@@ -2121,7 +2125,7 @@
(sheet-adopt-child pane vscrollbar))
(when (member scroll-bar '(:horizontal :both t))
(setq hscrollbar
- (make-pane 'scroll-bar-pane
+ (make-pane 'scroll-bar
:orientation :horizontal
:client (first (sheet-children viewport))
:drag-callback (lambda (gadget new-value)
--- /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/24 22:43:03 1.5
+++ /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/12/19 04:02:14 1.6
@@ -89,7 +89,7 @@
(setf (gadget-value object) value))
(defmethod make-pane-1 :around (fm (frame application-frame)
- (type (eql :text-editor))
+ (type (eql 'text-editor))
&rest args &key)
(apply #'make-pane-1 fm frame :drei
:drei-class 'text-editor-pane
@@ -278,14 +278,14 @@
;;; Drei/Goatee selection.
(defmethod make-pane-1 :around (fm (frame application-frame)
- (type (eql :text-field))
+ (type (eql 'text-field))
&rest args &key)
(if *use-goatee*
(apply #'make-pane-1 fm frame 'goatee-text-field-pane args)
(apply #'make-pane-1 fm frame 'text-field-pane args)))
(defmethod make-pane-1 :around (fm (frame application-frame)
- (type (eql :text-editor))
+ (type (eql 'text-editor))
&rest args &key)
(if *use-goatee*
(apply #'make-pane-1 fm frame 'goatee-text-editor-pane args)
More information about the Mcclim-cvs
mailing list