Changeset 6105


Ignore:
Timestamp:
Mar 28, 2007, 6:51:46 AM (12 years ago)
Author:
gb
Message:

Avoid binding variables whose names conflict with (now DEFSTATIC)
ObjC class names.

Location:
branches/objc-gf/ccl/examples
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/objc-gf/ccl/examples/cocoa-editor.lisp

    r6060 r6105  
    985985;;; early in the loading sequence confuses some Carbon libraries that're
    986986;;; used in the event dispatch mechanism,
    987 (defun draw-modeline-string (modeline-view)
    988   (let* ((pane (modeline-view-pane modeline-view))
    989          (buffer (buffer-for-modeline-view modeline-view)))
     987(defun draw-modeline-string (the-modeline-view)
     988  (let* ((pane (modeline-view-pane the-modeline-view))
     989         (buffer (buffer-for-modeline-view the-modeline-view)))
    990990    (when buffer
    991991      ;; You don't want to know why this is done this way.
  • branches/objc-gf/ccl/examples/cocoa-typeout.lisp

    r5885 r6105  
    151151  ;;  it to the text-storage buffer.
    152152  ;;
    153   (let* ((typeout-view (typeout-panel-typeout-view *typeout-panel*))
    154          (text-storage (slot-value typeout-view 'text-storage))
     153  (let* ((the-typeout-view (typeout-panel-typeout-view *typeout-panel*))
     154         (text-storage (slot-value the-typeout-view 'text-storage))
    155155         (str (make-string 1 :initial-element char))
    156156         (attr-str (make-instance 'ns:ns-attributed-string
     
    167167                                  :with-string str
    168168                                  :attributes *typeout-attributes*))
    169          (typeout-view (typeout-panel-typeout-view *typeout-panel*))
    170          (text-storage (slot-value typeout-view 'text-storage)))
     169         (the-typeout-view (typeout-panel-typeout-view *typeout-panel*))
     170         (text-storage (slot-value the-typeout-view 'text-storage)))
    171171    (setf (typeout-stream-line-position stream) (length string))
    172172    (send text-storage :append-attributed-string attr-str)))
     
    181181(defmethod stream-clear-output ((stream typeout-stream))
    182182  (prepare-typeout-stream stream)
    183   (let* ((typeout-view (typeout-panel-typeout-view *typeout-panel*))
    184          (text-storage (slot-value typeout-view 'text-storage))
     183  (let* ((the-typeout-view (typeout-panel-typeout-view *typeout-panel*))
     184         (text-storage (slot-value the-typeout-view 'text-storage))
    185185         (len (send text-storage 'length)))
    186186    (declare (type ns:ns-text-storage text-storage))
Note: See TracChangeset for help on using the changeset viewer.