[Author: dmaclach]

Fix up GTMTheme so that it returns a color for iconColorForStyle:state:
and so that it doesn't broadcast notifications whenever the background
color is changed.

We need this class cleaned up. It's a real mess.
http://code.google.com/p/google-toolbox-for-mac/issues/detail?id=37

R=thomasvl
DELTA=12  (6 added, 3 deleted, 3 changed)

1 files changed, 10 insertions, 7 deletions

diff --git a/AppKit/GTMTheme.m b/AppKit/GTMTheme.m
index 7b966f9..bb197fe 100644
--- a/AppKit/GTMTheme.m
+++ b/AppKit/GTMTheme.m
@@ -137,9 +137,9 @@ NSString *const kGTMThemeBackgroundColorKey = @"GTMThemeBackgroundColor";
 }
 
 - (void)sendChangeNotification {
-  [[NSNotificationCenter defaultCenter]
-   postNotificationName:kGTMThemeDidChangeNotification
-   object:self];
+  NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+  [nc postNotificationName:kGTMThemeDidChangeNotification
+                    object:self];
 }
 
 - (id)keyForSelector:(SEL)selector
@@ -191,8 +191,6 @@ NSString *const kGTMThemeBackgroundColorKey = @"GTMThemeBackgroundColor";
   if (backgroundColor_ != value) {
     [backgroundColor_ release];
     backgroundColor_ = [value retain];
-    [values_ removeAllObjects];
-    [self sendChangeNotification];
   }
 }
 - (NSColor *)backgroundColor {
@@ -206,7 +204,6 @@ NSString *const kGTMThemeBackgroundColorKey = @"GTMThemeBackgroundColor";
   if (backgroundImage_ != value) {
     [backgroundImage_ release];
     backgroundImage_ = [value retain];
-    [self sendChangeNotification];
   }
 }
 
@@ -484,7 +481,13 @@ NSString *const kGTMThemeBackgroundColorKey = @"GTMThemeBackgroundColor";
                          state:(GTMThemeState)state {
   NSColor *color = [self valueForSelector:_cmd style:style state:state];
   if (color) return color;
-
+  
+  if ([self styleIsDark:style state:state]) {
+    color = [NSColor whiteColor];
+  } else {
+    color = [NSColor blackColor];
+  }
+  
   [self cacheValue:color forSelector:_cmd style:style state:state];
   return color;
 }