From 7266821eaec08baa80923fa38a95bf147d5ee4d9 Mon Sep 17 00:00:00 2001
From: Francisco Tolmasky <francisco@280north.com>
Date: Mon, 18 May 2009 16:44:07 -0700
Subject: [PATCH] Some minor theme fixes.

Reviewed by me.
---
 AppKit/Tools/BlendKit/BKShowcaseController.j |  1 +
 AppKit/Tools/BlendKit/BKUtilities.j          | 22 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/AppKit/Tools/BlendKit/BKShowcaseController.j b/AppKit/Tools/BlendKit/BKShowcaseController.j
index 23f198315..6eb8deb5e 100644
--- a/AppKit/Tools/BlendKit/BKShowcaseController.j
+++ b/AppKit/Tools/BlendKit/BKShowcaseController.j
@@ -115,6 +115,7 @@
         
     _view = [anObject valueForKey:@"themedObject"];
 
+    [_view setTheme:nil];
     [_view setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin | CPViewMinYMargin | CPViewMaxYMargin];
     [_view setFrameOrigin:CGPointMake((CGRectGetWidth([self bounds]) - CGRectGetWidth([_view frame])) / 2.0, (CGRectGetMinY([_label frame]) - CGRectGetHeight([_view frame])) / 2.0)];
     
diff --git a/AppKit/Tools/BlendKit/BKUtilities.j b/AppKit/Tools/BlendKit/BKUtilities.j
index bda6e696a..42e3de0c2 100644
--- a/AppKit/Tools/BlendKit/BKUtilities.j
+++ b/AppKit/Tools/BlendKit/BKUtilities.j
@@ -1,5 +1,5 @@
 
-@implementation AKThemeTemplate : CPObject
+@implementation BKThemeTemplate : CPObject
 {
     CPString    _name;
     CPString    _description;
@@ -11,8 +11,8 @@
     
     if (self)
     {
-        _name = [aCoder decodeObjectForKey:@"AKThemeTemplateName"];
-        _description = [aCoder decodeObjectForKey:@"AKThemeTemplateDescription"];
+        _name = [aCoder decodeObjectForKey:@"BKThemeTemplateName"];
+        _description = [aCoder decodeObjectForKey:@"BKThemeTemplateDescription"];
     }
     
     return self;
@@ -20,13 +20,13 @@
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    [aCoder encodeObject:_name forKey:@"AKThemeTemplateName"];
-    [aCoder encodeObject:_description forKey:@"AKThemeTemplateDescription"];
+    [aCoder encodeObject:_name forKey:@"BKThemeTemplateName"];
+    [aCoder encodeObject:_description forKey:@"BKThemeTemplateDescription"];
 }
 
 @end
 
-@implementation AKThemeObjectTemplate : CPView
+@implementation BKThemeObjectTemplate : CPView
 {
     CPString    _label;
     id          _themedObject;
@@ -38,8 +38,8 @@
     
     if (self)
     {
-        _label = [aCoder decodeObjectForKey:@"AKThemeObjectTemplateLabel"];
-        _themedObject = [aCoder decodeObjectForKey:@"AKThemeObjectTemplateThemedObject"];
+        _label = [aCoder decodeObjectForKey:@"BKThemeObjectTemplateLabel"];
+        _themedObject = [aCoder decodeObjectForKey:@"BKThemeObjectTemplateThemedObject"];
     }
     
     return self;
@@ -47,8 +47,8 @@
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    [aCoder encodeObject:_label forKey:@"AKThemeObjectTemplateLabel"];
-    [aCoder encodeObject:_themedObject forKey:@"AKThemeObjectTemplateThemedObject"];
+    [aCoder encodeObject:_label forKey:@"BKThemeObjectTemplateLabel"];
+    [aCoder encodeObject:_themedObject forKey:@"BKThemeObjectTemplateThemedObject"];
 }
 
 @end
@@ -89,7 +89,7 @@ function BKThemeObjectTemplatesForClass(aClass)
             
             if (object)
             {
-                var template = [[AKThemeObjectTemplate alloc] init];
+                var template = [[BKThemeObjectTemplate alloc] init];
 
                 [template setValue:object forKey:@"themedObject"];
                 [template setValue:BKLabelFromIdentifier(selector) forKey:@"label"];