generate the inspector tab button images dynamically when selected/deselected instead...

diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m
index 5d07301f3915bd632822d7457db5067931ad7edd..6c24c91140b9cdeab149eaea1d5f2e747ea4b148 100644 (file)
--- a/macosx/BadgeView.m
+++ b/macosx/BadgeView.m
@@ -70,7 +70,6 @@
 - (void) setQuitting
 {
     fQuitting = YES;
-    [self display];
 }
 
 - (void) drawRect: (NSRect) rect

diff --git a/macosx/InfoTabButtonCell.h b/macosx/InfoTabButtonCell.h
index dba0b35b7e08643890767edae9cc0d34e62eed15..4a7d045aaa086ba47e6deccdd96839aad8d6647e 100644 (file)
--- a/macosx/InfoTabButtonCell.h
+++ b/macosx/InfoTabButtonCell.h
@@ -26,7 +26,7 @@
 
 @interface InfoTabButtonCell : NSButtonCell
 {
-    NSImage * fIcon, * fRegularImage, * fSelectedImage;
+    NSImage * fIcon;
     
     BOOL fSelected;
 }

diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m
index 3239ddeb552d747c9c6520c5c3442c5a74417b85..a8e4ae3237edf083f5ca4164988c3dc08c89eb98 100644 (file)
--- a/macosx/InfoTabButtonCell.m
+++ b/macosx/InfoTabButtonCell.m
@@ -43,8 +43,6 @@
     
     [fIcon release];
     
-    [fRegularImage release];
-    [fSelectedImage release];
     [super dealloc];
 }
 
@@ -53,17 +51,6 @@
     [fIcon release];
     fIcon = [image retain];
     
-    if (fRegularImage)
-    {
-        [fRegularImage release];
-        fRegularImage = nil;
-    }
-    if (fSelectedImage)
-    {
-        [fSelectedImage release];
-        fSelectedImage = nil;
-    }
-    
     [self setSelectedTab: fSelected];
 }
 
@@ -72,49 +59,29 @@
     fSelected = selected;
     
     NSImage * tabImage;
-    BOOL createImage = NO;
     if (fSelected)
-    {
-        if (!fSelectedImage)
-        {
-            fSelectedImage = [NSColor currentControlTint] == NSGraphiteControlTint
-                ? [[NSImage imageNamed: @"InfoTabBackGraphite.png"] copy] : [[NSImage imageNamed: @"InfoTabBackBlue.png"] copy];
-            createImage = YES;
-        }
-        tabImage = fSelectedImage;
-    }
+        tabImage = [NSColor currentControlTint] == NSGraphiteControlTint
+                    ? [[NSImage imageNamed: @"InfoTabBackGraphite.png"] copy] : [[NSImage imageNamed: @"InfoTabBackBlue.png"] copy];
     else
-    {
-        if (!fRegularImage)
-        {
-            fRegularImage = [[NSImage imageNamed: @"InfoTabBack.png"] copy];
-            createImage = YES;
-        }
-        tabImage = fRegularImage;
-    }
+        tabImage = [[NSImage imageNamed: @"InfoTabBack.png"] copy];
     
-    if (createImage)
+    if (fIcon)
     {
-        if (fIcon)
-        {
-            NSSize iconSize = [fIcon size], tabSize = [tabImage size];
-            NSPoint point = NSMakePoint(floorf((tabSize.width - iconSize.width) * 0.5),
-                                        floorf((tabSize.height - iconSize.height) * 0.5));
-            
-            [tabImage lockFocus];
-            [fIcon compositeToPoint: point operation: NSCompositeSourceOver];
-            [tabImage unlockFocus];
-        }
+        NSSize iconSize = [fIcon size], tabSize = [tabImage size];
+        NSPoint point = NSMakePoint(floorf((tabSize.width - iconSize.width) * 0.5),
+                                    floorf((tabSize.height - iconSize.height) * 0.5));
+        
+        [tabImage lockFocus];
+        [fIcon compositeToPoint: point operation: NSCompositeSourceOver];
+        [tabImage unlockFocus];
     }
     
     [self setImage: tabImage];
+    [tabImage release];
 }
 
 - (void) updateControlTint: (NSNotification *) notification
 {
-    [fSelectedImage release];
-    fSelectedImage = nil;
-    
     if (fSelected)
         [self setSelectedTab: YES];
 }