[mcclim-cvs] CVS mcclim

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim
In directory clnet:/tmp/cvs-serv23985

Modified Files:
	X11-colors.lisp design.lisp 
Log Message:
Moved the +black+ and +white+ colour definitions to design.lisp.

The rationale that these are hardly X11-specific, and they're needed
before colors.lisp is loaded anyway.


--- /project/mcclim/cvsroot/mcclim/X11-colors.lisp	2003/03/21 21:36:58	1.2
+++ /project/mcclim/cvsroot/mcclim/X11-colors.lisp	2008/01/21 20:54:48	1.3
@@ -59,8 +59,6 @@
 (defconstant +LavenderBlush+ (make-named-color "LavenderBlush" 1.0000 0.9412 0.9608))
 (defconstant +misty-rose+ (make-named-color "misty-rose" 1.0000 0.8941 0.8824))
 (defconstant +MistyRose+ (make-named-color "MistyRose" 1.0000 0.8941 0.8824))
-(defconstant +white+ (make-named-color "white" 1.0000 1.0000 1.0000))
-(defconstant +black+ (make-named-color "black" 0.0000 0.0000 0.0000))
 (defconstant +dark-slate-gray+ (make-named-color "dark-slate-gray" 0.1843 0.3098 0.3098))
 (defconstant +DarkSlateGray+ (make-named-color "DarkSlateGray" 0.1843 0.3098 0.3098))
 (defconstant +dark-slate-grey+ (make-named-color "dark-slate-grey" 0.1843 0.3098 0.3098))
--- /project/mcclim/cvsroot/mcclim/design.lisp	2008/01/14 07:03:15	1.27
+++ /project/mcclim/cvsroot/mcclim/design.lisp	2008/01/21 20:54:48	1.28
@@ -917,6 +917,11 @@
 	   (= g1 g2)
 	   (= b1 b2)))))
 
+;;; The two default colors
+
+(defconstant +white+ (make-named-color "white" 1.0000 1.0000 1.0000))
+(defconstant +black+ (make-named-color "black" 0.0000 0.0000 0.0000))
+
 ;;; Color utilities
 
 (defgeneric highlight-shade (ink)