[Author: alcor]

Fixes for tvl

R=thomasvl,dmaclach
DELTA=8  (0 added, 2 deleted, 6 changed)

2 files changed, 3 insertions, 5 deletions

diff --git a/AppKit/GTMTheme.h b/AppKit/GTMTheme.h
index c4de712..d5e02b9 100644
--- a/AppKit/GTMTheme.h
+++ b/AppKit/GTMTheme.h
@@ -44,11 +44,10 @@ typedef NSUInteger GTMThemeState;
 // based on interpolation of a single background color
 
 @interface GTMTheme : NSObject {
-@private
+ @private
   NSColor *backgroundColor_;  // bound to user defaults 
   NSImage *backgroundImage_;  // bound to user defaults 
   NSMutableDictionary *values_; // cached values
-  NSString *basePath_; // base path for referenced resources
 }
 
 // Access the global theme. By default this is bound to user defaults
diff --git a/AppKit/GTMTheme.m b/AppKit/GTMTheme.m
index f606f4c..91c4891 100644
--- a/AppKit/GTMTheme.m
+++ b/AppKit/GTMTheme.m
@@ -46,7 +46,6 @@ NSString *kGTMThemeDidChangeNotification = @"kGTMThemeDidChangeNotification";
 @end
 
 @interface GTMTheme ()
-- (void)bindToUserDefaults;
 - (void)sendChangeNotification;
 @end
 
@@ -189,7 +188,7 @@ NSString *kGTMThemeDidChangeNotification = @"kGTMThemeDidChangeNotification";
       // TODO(alcor): dim images when disabled
       color = [NSColor colorWithPatternImage:backgroundImage_];
 
-      if (state != GTMThemeStateActiveWindow) {
+      if ((state & GTMThemeStateActiveWindow) != GTMThemeStateActiveWindow) {
         NSImage *image =
             [self backgroundImageForStyle:style
                                     state:GTMThemeStateActiveWindow];
@@ -218,7 +217,7 @@ NSString *kGTMThemeDidChangeNotification = @"kGTMThemeDidChangeNotification";
     }
   }
 
-  if (value) [self cacheValue:value forSelector:_cmd style:style state:state];
+  [self cacheValue:value forSelector:_cmd style:style state:state];
   return value;
 }