Changeset 153 for trunk/Cocoa/F-Script Anywhere/Source/NSString-NJRExtensions.m

Timestamp:

02/13/04 21:01:06 (20 years ago)

Author:

Nicholas Riley

Message:

Integrates SCPatch and mach_inject; unfinished, buggy.

File:

• trunk/Cocoa/F-Script Anywhere/Source/NSString-NJRExtensions.m (modified) (2 diffs)

trunk/Cocoa/F-Script Anywhere/Source/NSString-NJRExtensions.m

@@ -14 +14 @@
 #import "NSString-NJRExtensions.h"
 
+#ifndef NSAppKitVersionNumber10_2
+#define NSAppKitVersionNumber10_2 663
+#endif
+
 @implementation NSString (NJRExtensions)
 
@@ -20 +24 @@
     NSAttributedString *s = [NSAttributedString alloc];
     NSMutableParagraphStyle *ps = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-    OSStatus err;
-    /*
-    NSString *fs;
-    Str255 font;
-    SInt16 size; // label font is 10, pushbutton font 13, views font is 12!
-    err = GetThemeFont(kThemeViewsFont, smUnicodeScript, font, &size, NULL);
-    fs = CFStringCreateWithPascalString(kCFAllocatorDefault, font, CFStringGetSystemEncoding());
-    NSLog(@"Theme font: %@ %d", fs, size);
-    */
-    err = TruncateThemeText((CFMutableStringRef) text, kThemeViewsFont,
-                            kThemeStateActive, width, truncMiddle, NULL);
-    /* // There's a workaround for a 10.1 bug in Connections' awakeFromNib: the initial
-       // column size is wrong, until you resize the window.  Here's how to demonstrate the bug:
-    {   static float lastWidth = 0; // XXX debug
-        if (lastWidth != width) {
-            lastWidth = width;
-            NSLog(@"Got width %f", width);
-        }
+    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_2) {
+        [ps setLineBreakMode: NSLineBreakByTruncatingMiddle];
+    } else {
+        // Mac OS X versions earlier than 10.3 don't implement NSLineBreakByTruncatingMiddle; fake it
+        OSStatus err;
+        err = TruncateThemeText((CFMutableStringRef) text, kThemeViewsFont,
+                                kThemeStateActive, width, truncMiddle, NULL);
+        if (err != noErr) FSALog(@"-[NSString asAttributedStringTruncatedToWidth:]: TruncateThemeText failed with error %d", err);
+        [ps setLineBreakMode: NSLineBreakByClipping];
     }
-    */
-    if (err != noErr) FSALog(@"-[NSString asAttributedStringTruncatedToWidth:]: TruncateThemeText failed with error %d", err);
-    // XXX Should be able to skip the above by using NSLineBreakByTruncatingMiddle,
-    // XXX but OS X 10.1 doesn't implement it yet.
-    [ps setLineBreakMode: NSLineBreakByClipping];
     s = [s initWithString: text attributes:
            [NSDictionary dictionaryWithObjectsAndKeys: ps, NSParagraphStyleAttributeName, nil]];