• Eliminated -lockFocus and -unlockFocus in -drawRect methods, where it was never needed.

•  Replaced -lockFocus and -unlockFocus in offscreen drawing methods with -[NSImage imageWithSize:flipped:drawingHandler:], for compatibility with resolution-independent graphics..  FILES WITH THIS CHANGE NOW REQUIRE OS X 10.8 OR LATER.

Author: jerrykrinock

SSYGrayRect.m

@@ -13,9 +13,6 @@ - (void)awakeFromNib {
 
 - (void)drawRect:(NSRect)dirtyRect {
 	[super drawRect:dirtyRect] ;
-	
-	[self lockFocus] ;
-	
 	NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:[self topWhite]
                                                                                                  alpha:1.0]
 														 endingColor:[NSColor colorWithCalibratedWhite:[self bottomWhite]
@@ -30,7 +27,6 @@ - (void)drawRect:(NSRect)dirtyRect {
     frame.size.height = [self frame].size.height ;
 	[gradient drawInRect:frame
 				   angle:270.0] ;
-	[self unlockFocus] ;
 	[gradient release] ;
 }
 

SSYHintArrow.m

@@ -108,31 +108,30 @@ - (NSBezierPath *)backgroundPath {
 }
 
 - (NSColor *)backgroundColorPatternImage {
-    NSImage* bg = [[NSImage alloc] initWithSize:[self frame].size] ;
-    NSRect bgRect = NSZeroRect ;
-    bgRect.size = [bg size] ;
-    
-    [bg lockFocus] ;
-    NSBezierPath* bgPath = [self backgroundPath] ;
-    [NSGraphicsContext saveGraphicsState] ;
-    [bgPath addClip] ;
-    
-    // Draw background gradient.
-	[m_gradient drawInBezierPath:bgPath
-									  angle:270.0] ;
-    
-    // Draw border if appropriate.
-    if (m_borderWidth > 0) {
-        // Double the borderWidth since we're drawing inside the path.
-        [bgPath setLineWidth:(m_borderWidth * 2.0) * SSYHINTARROW_SCALE_FACTOR] ;
-        [m_borderColor set] ;
-        [bgPath stroke] ;
-    }
-    
-    [NSGraphicsContext restoreGraphicsState] ;
-    [bg unlockFocus] ;
-    
-    return [NSColor colorWithPatternImage:[bg autorelease]] ;
+    NSImage* bg = [NSImage imageWithSize:[self frame].size
+                                 flipped:NO
+                          drawingHandler:^(NSRect dstRect) {
+                              NSBezierPath* bgPath = [self backgroundPath] ;
+                              [NSGraphicsContext saveGraphicsState] ;
+                              [bgPath addClip] ;
+                              
+                              // Draw background gradient.
+                              [m_gradient drawInBezierPath:bgPath
+                                                     angle:270.0] ;
+                              
+                              // Draw border if appropriate.
+                              if (m_borderWidth > 0) {
+                                  // Double the borderWidth since we're drawing inside the path.
+                                  [bgPath setLineWidth:(m_borderWidth * 2.0) * SSYHINTARROW_SCALE_FACTOR] ;
+                                  [m_borderColor set] ;
+                                  [bgPath stroke] ;
+                              }
+                              [NSGraphicsContext restoreGraphicsState] ;
+
+                              return YES ;
+                          }] ;
+
+    return [NSColor colorWithPatternImage:bg] ;
 }
 
 - (void)updateBackground {
@@ -298,9 +297,8 @@ + (CAKeyframeAnimation *)shakeAnimation:(NSRect)frame {
 + (void)showHelpArrowAtPoint:(NSPoint)point
 					inWindow:(NSWindow*)window {
 	if (static_helpArrow) {
-		// Only one SSYHintArrow at a time!!
-		NSLog(@"Internal Error 892-8178  Intercepted call to display > 1 SSYHintArrow") ;
-		return ;
+		// Only one SSYHintArrow at a time!  Destroy the prior one.
+        [static_helpArrow endWithNote:nil] ;
 	}
 
 	static_helpArrow = [[SSYHintArrow alloc] initAttachedToPoint:point 

SSYMenuAddButton.m

@@ -7,8 +7,6 @@ @implementation SSYMenuAddButton
 - (void)drawRect:(NSRect)dirtyRect {
 	[super drawRect:dirtyRect] ;
 
-	[self lockFocus] ;
-	
     // Draw the "+"
     // The y-axis seems to be flipped in here.
     NSImage* image = [NSImage imageNamed:@"NSAddTemplate"] ;
@@ -28,8 +26,6 @@ - (void)drawRect:(NSRect)dirtyRect {
 	[path relativeLineToPoint:NSMakePoint(-4, 4)] ;
 	[path closePath] ;
 	[path fill] ;
-	
-	[self unlockFocus] ;
 }
 
  @end

SSYMenuGearButton.m

@@ -6,8 +6,6 @@ @implementation SSYMenuGearButton
 - (void)drawRect:(NSRect)dirtyRect {
 	[super drawRect:dirtyRect] ;
 
-	[self lockFocus] ;
-	
 	// Draw the Gear
 	NSImage* image = [NSImage imageNamed:@"NSActionTemplate"] ;
 	[image drawInRect:NSMakeRect(3,
@@ -25,8 +23,6 @@ - (void)drawRect:(NSRect)dirtyRect {
 	[path relativeLineToPoint:NSMakePoint(-4, 4)] ;
 	[path closePath] ;
 	[path fill] ;
-	
-	[self unlockFocus] ;
 }
 
  @end

SSYTokenField.m

@@ -15,11 +15,9 @@ - (void)drawRect:(NSRect)rect {
 	[bp relativeLineToPoint:NSMakePoint(frame.size.width, frame.size.height)] ;
 	[bp moveToPoint:NSMakePoint(frame.origin.x, frame.origin.y+frame.size.height)] ;
 	[bp relativeLineToPoint:NSMakePoint(frame.size.width, -frame.size.height)] ;
-	[self lockFocus] ;
 	[bp setLineWidth:4.0] ;
 	[[NSColor redColor] set] ;
 	[bp stroke] ;
-	[self unlockFocus] ;
 	[super drawRect:rect] ;
 }
 @end

SSYToolbarButton.m

@@ -125,10 +125,8 @@ - (IBAction)doDaClick:(id)sender {
     if ([self flashDuration] > 0.0) {
         NSImage* image = [self image] ;
         [self setOriginalImage:image] ;
-        NSImage* darkerImage = [image copy] ;
-        [darkerImage darken] ;
+        NSImage* darkerImage = [image darkenedImage] ;
         [self setImage:darkerImage] ;
-        [darkerImage release] ;
         NSTimer* timer = [NSTimer scheduledTimerWithTimeInterval:[self flashDuration]
                                                           target:self
                                                         selector:@selector(restoreOriginalImage:)

SSYVectorImages.m

@@ -16,12 +16,9 @@ + (void)glyphOnPath:(NSBezierPath*)path
                              inFont:font] ;
 }
 
-+ (NSImage*)imageWithGlyphName:(NSString*)glyphName
-                      fattenBy:(CGFloat)fattenBy
-                          fill:(BOOL)fill {
-    NSSize size = NSMakeSize(100/fattenBy, 100) ;
-    NSImage* image = [[NSImage alloc] initWithSize:size] ;
-    [image lockFocus] ;
++ (void)drawGlyphName:(NSString*)glyphName
+                 size:(NSSize)size
+                 fill:(BOOL)fill {
     NSBezierPath* bezier = [NSBezierPath bezierPath] ;
     [self glyphOnPath:bezier
                  name:glyphName
@@ -33,8 +30,33 @@ + (NSImage*)imageWithGlyphName:(NSString*)glyphName
         [[NSColor blackColor] setFill] ;
         [bezier fill] ;
     }
-    [image unlockFocus] ;
-    [image autorelease] ;
+}
+
++ (NSImage*)imageWithGlyphName:(NSString*)glyphName
+                      fattenBy:(CGFloat)fattenBy
+                          fill:(BOOL)fill {
+    NSSize size = NSMakeSize(100/fattenBy, 100) ;
+    NSImage* image ;
+    if ([NSImage respondsToSelector:@selector(imageWithSize:flipped:drawingHandler:)]) {
+        // We must be in OS X 10.8 or later
+        image = [NSImage imageWithSize:size
+                               flipped:NO
+                        drawingHandler:^(NSRect dstRect) {
+                            [self drawGlyphName:glyphName
+                                           size:size
+                                           fill:fill] ;
+                            return YES ;
+                        }] ;
+    }
+    else {
+        image = [[NSImage alloc] initWithSize:size] ;
+        [image lockFocus] ;
+        [self drawGlyphName:glyphName
+                       size:size
+                       fill:fill] ;
+        [image unlockFocus] ;
+        [image autorelease] ;
+    }
 
     return image ;
 }
@@ -496,6 +518,7 @@ + (NSImage*)imageStyle:(SSYVectorImageStyle)style
     NSImage* rotatedImage ;
 
     if ([NSImage respondsToSelector:@selector(imageWithSize:flipped:drawingHandler:)]) {
+        // We must be in OS X 10.8 or later
         image = [NSImage imageWithSize:size
                                flipped:NO
                         drawingHandler:^(NSRect dstRect) {