From bf8070c42d64f3def6d918fa617f417155c3b092 Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@gmail.com>
Date: Tue, 19 Jan 2016 16:08:59 -0800
Subject: [PATCH] Revert "FIXED: Bug introduced by
 https://github.com/cappuccino/cappuccino/commit/9fba72cbab42145dc585c01efd82ce645373c04e#diff-227ef108401c2160357ae3fc65018c65R620"

This reverts commit ad48381744ffc5d764c00623cb3a6dc4f222acfc.
---
 AppKit/CPBox.j | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AppKit/CPBox.j b/AppKit/CPBox.j
index 29d0b3a08..948151f1c 100644
--- a/AppKit/CPBox.j
+++ b/AppKit/CPBox.j
@@ -598,7 +598,8 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
     CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
     CPBoxTitle            = @"CPBoxTitle",
     CPBoxTitlePosition    = @"CPBoxTitlePosition",
-    CPBoxTitleView        = @"CPBoxTitleView";
+    CPBoxTitleView        = @"CPBoxTitleView",
+    CPBoxContentView      = @"CPBoxContentView";
 
 @implementation CPBox (CPCoding)
 
@@ -615,7 +616,8 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
         _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
         _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
 
-        _contentView   = [self subviews][0];
+        _contentView   = [aCoder decodeObjectForKey:CPBoxContentView] || [[CPView alloc] initWithFrame:[self bounds]];
+        [self replaceSubview:_contentView with:[self subviews][0]];
 
         [self setAutoresizesSubviews:YES];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -635,6 +637,7 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
     [aCoder encodeObject:_title forKey:CPBoxTitle];
     [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
     [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
+    [aCoder encodeObject:_contentView forKey:CPBoxContentView];
 }
 
 @end