[mcclim-cvs] CVS update: mcclim/Backends/CLX/medium.lisp

[Timothy Moore]

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX
In directory common-lisp.net:/tmp/cvs-serv15329/Backends/CLX

Modified Files:
	medium.lisp 
Log Message:

In method medium-gcontext ((medium clx-medium) (ink
climi::transformed-design)), do return the gcontext as the value of
the function. This was screwed up by me in the last commit to this
file.

Fixes the bug reported by Paolo Amoroso on Jan 17 2005: <integer> is
not of type XLIB:GCONTEXT error when  using pixmaps in Listener

Date: Tue Jan 18 05:35:28 2005
Author: tmoore

Index: mcclim/Backends/CLX/medium.lisp
diff -u mcclim/Backends/CLX/medium.lisp:1.64 mcclim/Backends/CLX/medium.lisp:1.65
--- mcclim/Backends/CLX/medium.lisp:1.64	Tue Jan 11 05:35:33 2005
+++ mcclim/Backends/CLX/medium.lisp	Tue Jan 18 05:35:26 2005
@@ -301,7 +301,8 @@
 	   (setf (xlib:gcontext-ts-x gc) gc-x
                (xlib:gcontext-ts-y gc) gc-y
                (xlib:gcontext-clip-x gc) gc-x
-               (xlib:gcontext-clip-y gc) gc-y))))
+               (xlib:gcontext-clip-y gc) gc-y)
+	   gc)))
       (t
        (error "You lost, we not yet implemented transforming an ~S."
               (type-of ink))))))
@@ -514,8 +515,6 @@
     (with-transformed-position (tr left top)
       (with-transformed-position (tr right bottom)
         (with-clx-graphics (medium)
-	   #+nil (when (typep mirror 'xlib:pixmap)
-		  (break))
           (if (< right left)
               (rotatef left right))
           (if (< bottom top)
@@ -524,14 +523,14 @@
                 (top    (round-coordinate top))
                 (right  (round-coordinate right))
                 (bottom (round-coordinate bottom)))
-            ;; To clip rectangles, we just need to clamp the cooridnates
+            ;; To clip rectangles, we just need to clamp the
+	    ;; coordinates
             (xlib:draw-rectangle mirror gc
                                  (max #x-8000 (min #x7FFF left))
                                  (max #x-8000 (min #x7FFF top))
                                  (max 0 (min #xFFFF (- right left)))
                                  (max 0 (min #xFFFF (- bottom top)))
-                                 filled)
-	    ))))))
+                                 filled)))))))
 
 #+CLX-EXT-RENDER
 (defmethod medium-draw-rectangle-using-ink* ((medium clx-medium) (ink climi::uniform-compositum)