Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native In directory clnet:/tmp/cvs-serv3307/Backends/beagle/native

Modified Files: lisp-bezier-path.lisp lisp-image.lisp lisp-view.lisp Log Message: Try to make beagle backend run both on 64-bit and 32-bit clozure cl * Only tested on 64-bit clozure cl 1.2rc1 * hacked until clim-listener runs; chances are I missed many 'short-floats * Also don't (re)define symbols in the ccl package

--- /project/mcclim/cvsroot/mcclim/Backends/beagle/native/lisp-bezier-path.lisp 2005/05/16 22:13:17 1.1 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/native/lisp-bezier-path.lisp 2008/05/16 14:05:11 1.2 @@ -28,7 +28,7 @@ (defclass lisp-bezier-path (ns:ns-bezier-path) ((colour :foreign-type :id :accessor path-colour) - (fill :foreign-type :bool + (fill :foreign-type :<bool> :initform #$NO :accessor path-fill)) (:metaclass ns:+ns-object)) @@ -36,7 +36,7 @@ (define-objc-method ((:void :set-colour colour) lisp-bezier-path) (setf (path-colour self) colour))

-(define-objc-method ((:void :set-fill (:bool fill)) lisp-bezier-path) +(define-objc-method ((:void :set-fill (:<bool> fill)) lisp-bezier-path) (setf (path-fill self) fill))

(define-objc-method ((:void draw) lisp-bezier-path) --- /project/mcclim/cvsroot/mcclim/Backends/beagle/native/lisp-image.lisp 2005/05/16 22:13:17 1.1 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/native/lisp-image.lisp 2008/05/16 14:05:11 1.2 @@ -129,7 +129,7 @@ (progn (send self 'lock-focus) (let ((image (send (send (@class ns-image) 'alloc) :init-with-data (send bitmap "TIFFRepresentation")))) - (send image :dissolve-to-point point :fraction 1.0)) + (send image :dissolve-to-point point :fraction #.(cg-floatify 1.0))) ;;; (send (send self 'window) 'flush-window) (send self 'unlock-focus)))) ;;; (format *debug-io* "(paste-bitmap...) - FAILED TO LOCK FOCUS ON VIEW (NOT VALID) ~S!!!~%" self))) --- /project/mcclim/cvsroot/mcclim/Backends/beagle/native/lisp-view.lisp 2006/03/24 11:18:27 1.2 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/native/lisp-view.lisp 2008/05/16 14:05:11 1.3 @@ -119,7 +119,7 @@

(when (send self 'lock-focus-if-can-draw) (let ((image (send (send (@class ns-image) 'alloc) :init-with-data (send bitmap "TIFFRepresentation")))) - (send image :dissolve-to-point point :fraction 1.0)) + (send image :dissolve-to-point point :fraction #.(cg-floatify 1.0))) ;;; (send (send self 'window) 'flush-window) (send self 'unlock-focus)) ;;; (send (send self 'window) 'flush-window)) @@ -127,7 +127,7 @@

(define-objc-method ((:void :draw-image image :at-point (:<NSP>oint point)) lisp-view) (when (send self 'lock-focus-if-can-draw) - (send image :dissolve-to-point point :fraction 1.0) + (send image :dissolve-to-point point :fraction #.(cg-floatify 1.0)) (send self 'unlock-focus)))

;;; ----------------------------------------------------------------------------