Changeset 11320

Timestamp:

Nov 9, 2008, 6:23:49 PM (11 years ago)

Author:

rme

Message:

Avoid the new-with-Leopard convenience method
addTemporaryAttribute:value:forCharacterRange: so that we can keep
running on 10.4 systems.

File:

• trunk/source/cocoa-ide/cocoa-editor.lisp (modified) (2 diffs)

trunk/source/cocoa-ide/cocoa-editor.lisp

@@ -1171 +1171 @@
                   (setf (ns:ns-range-location range) (+ p istart)
                         (ns:ns-range-length range) (1+ (- iend istart)))
-                  (#/addTemporaryAttribute:value:forCharacterRange:
-                   layout color-attribute color range))))))))))
+                  (let ((attrs (#/dictionaryWithObject:forKey:
+                                ns:ns-dictionary color color-attribute)))
+                    (#/addTemporaryAttributes:forCharacterRange:
+                     layout attrs range)))))))))))
 
 (objc:defmethod (#/drawRect: :void) ((self hemlock-text-view) (rect :<NSR>ect))
@@ -1207 +1209 @@
              (paren-highlight-left (text-view-paren-highlight-left-pos self))
              (paren-highlight-right (text-view-paren-highlight-right-pos self))
-             (paren-highlight-color (text-view-paren-highlight-color self)))
-        (#/addTemporaryAttribute:value:forCharacterRange:
-         layout background paren-highlight-color (ns:make-ns-range paren-highlight-left 1))
-        (#/addTemporaryAttribute:value:forCharacterRange:
-         layout background paren-highlight-color (ns:make-ns-range paren-highlight-right 1))))
+             (paren-highlight-color (text-view-paren-highlight-color self))
+             (attrs (#/dictionaryWithObject:forKey: ns:ns-dictionary
+                                                    paren-highlight-color
+                                                    background)))
+        (#/addTemporaryAttributes:forCharacterRange:
+         layout attrs (ns:make-ns-range paren-highlight-left 1))
+        (#/addTemporaryAttributes:forCharacterRange:
+         layout attrs (ns:make-ns-range paren-highlight-right 1))))
     ;; Um, don't forget to actually draw the view..
     (call-next-method  rect)))