From b0d355a71c0b09f2da9aa04a8f6e118c1f473d43 Mon Sep 17 00:00:00 2001
From: Scott Kyle <scott@appden.com>
Date: Wed, 24 Mar 2010 19:30:51 -0700
Subject: [PATCH 1/2] Some somewhat minor style fixes

---
 AppKit/CPButton.j            |  7 ++-----
 AppKit/_CPImageAndTextView.j | 10 ++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index 0f1f5217a..8a602a607 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -502,8 +502,6 @@ CPButtonStateMixed  = CPThemeState("mixed");
     }
     else
         return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
-
-    return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
@@ -511,9 +509,8 @@ CPButtonStateMixed  = CPThemeState("mixed");
     var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:@"content-view"];
-      
-    if (bezelView)
-        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
     var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
                                              positioned:CPWindowAbove
diff --git a/AppKit/_CPImageAndTextView.j b/AppKit/_CPImageAndTextView.j
index e17e86de1..1ad2d6e76 100644
--- a/AppKit/_CPImageAndTextView.j
+++ b/AppKit/_CPImageAndTextView.j
@@ -332,7 +332,8 @@ var HORIZONTAL_MARGIN   = 3.0,
         hasDOMTextElement = !!_DOMTextElement;
     
     // Create or destroy the DOM Text Element as necessary
-    if (needsDOMTextElement !== hasDOMTextElement)    
+    if (needsDOMTextElement !== hasDOMTextElement)
+    {
         if (hasDOMTextElement)
         {
             _DOMElement.removeChild(_DOMTextElement);
@@ -361,6 +362,7 @@ var HORIZONTAL_MARGIN   = 3.0,
             // We have to set all these values now.
             _flags |= _CPImageAndTextViewTextChangedFlag | _CPImageAndTextViewFontChangedFlag | _CPImageAndTextViewLineBreakModeChangedFlag;
         }
+    }
     
     var textStyle = hasDOMTextElement ? _DOMTextElement.style : nil;
     
@@ -369,6 +371,7 @@ var HORIZONTAL_MARGIN   = 3.0,
         hasDOMTextShadowElement = !!_DOMTextShadowElement;
     
     if (needsDOMTextShadowElement !== hasDOMTextShadowElement)
+    {
         if (hasDOMTextShadowElement)
         {
             _DOMElement.removeChild(_DOMTextShadowElement);
@@ -408,6 +411,7 @@ var HORIZONTAL_MARGIN   = 3.0,
             
             _flags |= _CPImageAndTextViewTextChangedFlag; //sigh...
         }
+    }
         
     var shadowStyle = hasDOMTextShadowElement ? _DOMTextShadowElement.style : nil;
         
@@ -505,6 +509,7 @@ var HORIZONTAL_MARGIN   = 3.0,
 
     // Create or destroy DOM Image element    
     if (needsDOMImageElement !== hasDOMImageElement)
+    {
         if (hasDOMImageElement)
         {
             _DOMElement.removeChild(_DOMImageElement);
@@ -534,7 +539,8 @@ var HORIZONTAL_MARGIN   = 3.0,
             _DOMElement.appendChild(_DOMImageElement);
             
             hasDOMImageElement = YES;
-        }    
+        }
+    }
 #endif
 
     var size = [self bounds].size,

From eb831dc4ac445bea689799cc0a8d3989f520a05c Mon Sep 17 00:00:00 2001
From: Ross Boucher <ross@280north.com>
Date: Thu, 25 Mar 2010 10:40:37 -0700
Subject: [PATCH 2/2] Typo. Closes #572.

---
 AppKit/CPView.j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index 7b1bded96..318c45357 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -668,7 +668,7 @@ var CPViewFlags                     = { },
     return _tag;
 }
 
-- (void)viewWithTag:(CPInteger)aTag
+- (CPView)viewWithTag:(CPInteger)aTag
 {
     if ([self tag] == aTag)
         return self;