Changeset 5731

Timestamp:

Jan 18, 2007, 3:13:53 AM (18 years ago)

Author:

Gary Byers

Message:

Use CGFloat, type casts, etc.

Location:

trunk/ccl/examples

Files:

• cocoa-listener.lisp (modified) (2 diffs)
• cocoa-prefs.lisp (modified) (3 diffs)

trunk/ccl/examples/cocoa-listener.lisp

@@ -147 +147 @@
 (defmethod textview-background-color ((doc hemlock-listener-document))
   (send (find-class 'ns:ns-color)
-        :color-with-calibrated-red *listener-background-red-component*
-        :green *listener-background-green-component*
-        :blue *listener-background-blue-component*
-        :alpha *listener-background-alpha-component*))
+        :color-with-calibrated-red (float *listener-background-red-component* +cgfloat-zero+)
+        :green (float *listener-background-green-component* +cgfloat-zero+)
+        :blue (float *listener-background-blue-component* +cgfloat-zero+)
+        :alpha (float *listener-background-alpha-component* +cgfloat-zero+)))
 
 
@@ -232 +232 @@
     (send controller 'release)
     (slet ((current-point (ns-make-point (or *next-listener-x-pos*
-                                             *initial-listener-x-pos*)
+                                             (float *initial-listener-x-pos*
+                                                    +cgfloat-zero+))
                                          (or *next-listener-y-pos*
-                                             *initial-listener-y-pos*))))
+                                             (float *initial-listener-y-pos*
+                                                    +cgfloat-zero+)))))
       (slet ((new-point (send window
                               :cascade-top-left-from-point current-point)))

trunk/ccl/examples/cocoa-prefs.lisp

@@ -60 +60 @@
     (slet* ((contentsize (send scrollview 'content-size))
             (form-frame (ns-make-rect
-                         0.0f0
-                         0.0f0
+                         +cgfloat-zero+
+                         +cgfloat-zero+
                          (pref contentsize :<NSS>ize.width)
                          (pref contentsize :<NSS>ize.height))))
       (let* ((form (make-objc-instance 'ns:ns-form :with-frame form-frame)))
         (send form :set-scrollable t)
-        (send form :set-intercell-spacing (ns-make-size 1.0f0 4.0f0))
-        (send form :set-cell-size (ns-make-size 500.0f0 22.0f0))
+        (send form :set-intercell-spacing (ns-make-size (float 1.0f0 +cgfloat-zero+) (float 4.0f0 +cgfloat-zero+)))
+        (send form :set-cell-size (ns-make-size (float 500.0f0 +cgfloat-zero+) (float 22.0f0 +cgfloat-zero+)))
         (setf (prefs-view-form self) form)
         (send scrollview :set-document-view form)
@@ -149 +149 @@
                      prefs-view)
     (send-super :init-with-frame frame)
-  (slet ((scroll-frame (ns-make-rect 20.0f0 40.0f0 (- (pref frame :<NSR>ect.size.width) 40.0f0) (- (pref frame :<NSR>ect.size.height) 60.0f0))))
+  (slet ((scroll-frame (ns-make-rect (float 20.0f0 +cgfloat-zero+)
+                                     (float 40.0f0 +cgfloat-zero+)
+                                     (- (pref frame :<NSR>ect.size.width) 40.0f0)
+                                     (- (pref frame :<NSR>ect.size.height) 60.0f0))))
     (let* ((scrollview (make-objc-instance 'ns:ns-scroll-view
                                            :with-frame scroll-frame))
@@ -162 +165 @@
       (send scroll-content :set-autoresizes-subviews t)
       (setf (slot-value self 'scroll-view) scrollview)
-      (slet ((revert-frame (ns-make-rect 20.0f0 10.0f0 80.0f0 20.0f0))
+      (slet ((revert-frame (ns-make-rect (float 20.0f0 +cgfloat-zero+)
+                                         (float 10.0f0 +cgfloat-zero+)
+                                         (float 80.0f0 +cgfloat-zero+)
+                                         (float 20.0f0 +cgfloat-zero+)))
              (commit-frame (ns-make-rect (- (+ (pref frame :<NSR>ect.origin.x)
                                                (pref frame :<NSR>ect.size.width))
                                             (+ 80.0f0 20.0f0))
-                                         10.0f0
-                                         80.0f0
-                                         20.0f0)))
+                                         (float 10.0f0 +cgfloat-zero+)
+                                         (float 80.0f0 +cgfloat-zero+)
+                                         (float 20.0f0 +cgfloat-zero+))))
         (let* ((commit-button (make-objc-instance
                                'ns:ns-button