Refactor how TUIView handles subviews, for better memory management p…

…ractices and ARC compatibility

lib/UIKit/TUIView.h

@@ -228,7 +228,7 @@ extern CGRect(^TUIViewCenteredLayout)(TUIView*);
 @interface TUIView (TUIViewHierarchy)
 
 @property (nonatomic, readonly) TUIView *superview;
-@property (nonatomic, readonly, copy) NSArray *subviews;
+@property (nonatomic, readonly, strong) NSArray *subviews;
 
 /**
  Recursive search, handy for debugging.

lib/UIKit/TUIView.m

@@ -52,17 +52,26 @@ - (TUIView *)closestAssociatedView
 
 
 @interface TUIView ()
-@property (nonatomic, copy) NSArray *subviews;
+@property (nonatomic, readwrite, strong) NSMutableArray *subviews;
 @end
 
 @implementation TUIView
 
-@dynamic subviews;
+@synthesize subviews = _subviews;
 @synthesize drawRect;
 @synthesize layout;
 @synthesize toolTip;
 @synthesize toolTipDelay;
 
+- (void)setSubviews:(NSArray *)s
+{
+	[self.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
+
+	for(TUIView *subview in s) {
+		[self addSubview:subview];
+	}
+}
+
 + (void)initialize
 {
 	if(self == [TUIView class]) {
@@ -483,11 +492,6 @@ - (TUIView *)superview
 	return [self.layer.superlayer closestAssociatedView];
 }
 
-- (NSArray *)subviews
-{
-	return [self.layer.sublayers tui_map:@selector(associatedView)];
-}
-
 - (NSInteger)deepNumberOfSubviews
 {
 	NSInteger n = [self.subviews count];
@@ -496,19 +500,6 @@ - (NSInteger)deepNumberOfSubviews
 	return n;
 }
 
-- (void)setSubviews:(NSArray *)s
-{
-	NSMutableArray *toRemove = [NSMutableArray array];
-	for(CALayer *sublayer in self.layer.sublayers) {
-		[toRemove addObject:[sublayer associatedView]];
-	}
-	[toRemove makeObjectsPerformSelector:@selector(removeFromSuperview)];
-
-	for(TUIView *subview in s) {
-		[self addSubview:subview];
-	}
-}
-
 - (void)_cleanupResponderChain // called when a view is about to be removed from the heirarchy
 {
 	[self.subviews makeObjectsPerformSelector:@selector(_cleanupResponderChain)]; // call this first because subviews may pass first responder responsibility up to the superview
@@ -529,10 +520,12 @@ - (void)removeFromSuperview // everything should go through this
 	if(superview) {
 		[superview willRemoveSubview:self];
 		[self willMoveToSuperview:nil];
+
+		[superview.subviews removeObjectIdenticalTo:self];
 		[self.layer removeFromSuperlayer];
 		self.nsView = nil;
+
 		[self didMoveToSuperview];
-		[self autorelease]; // 'release'?
 	}
 }
 
@@ -591,7 +584,10 @@ - (void)setNextResponder:(NSResponder *)r
 }
 
 #define PRE_ADDSUBVIEW \
-	[view retain]; \
+	if (!_subviews) \
+		_subviews = [[NSMutableArray alloc] init]; \
+	\
+	[self.subviews addObject:view]; \
  	[view removeFromSuperview]; /* will call willAdd:nil and didAdd (nil) */ \
 	[view willMoveToSuperview:self]; \
 	view.nsView = _nsView;