Merge branch 'master' of github.com:glebd/bwtoolkit

Author: glebd

BWAnchoredButtonBar.h

@@ -8,15 +8,14 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface BWAnchoredButtonBar : NSView 
+@interface BWAnchoredButtonBar : NSView <NSSplitViewDelegate>
 {
 	BOOL isResizable, isAtBottom, handleIsRightAligned;
 	int selectedIndex;
-	id splitViewDelegate;
 }
 
-@property BOOL isResizable, isAtBottom, handleIsRightAligned;
-@property int selectedIndex;
+@property (nonatomic) BOOL isResizable, isAtBottom, handleIsRightAligned;
+@property (nonatomic) int selectedIndex;
 
 // The mode of this bar with a resize handle makes use of some NSSplitView delegate methods. Use the splitViewDelegate for any custom delegate implementations
 // you'd like to provide.

BWAnchoredButtonBar.m

@@ -34,14 +34,14 @@ @implementation BWAnchoredButtonBar
 
 + (void)initialize;
 {
-	topLineColor		 = [[NSColor colorWithCalibratedWhite:(202.0f / 255.0f) alpha:1] retain];
-	bottomLineColor		 = [[NSColor colorWithCalibratedWhite:(170.0f / 255.0f) alpha:1] retain];
-    topColor			 = [[NSColor colorWithCalibratedWhite:(253.0f / 255.0f) alpha:1] retain];
-    middleTopColor		 = [[NSColor colorWithCalibratedWhite:(242.0f / 255.0f) alpha:1] retain];
-    middleBottomColor	 = [[NSColor colorWithCalibratedWhite:(230.0f / 255.0f) alpha:1] retain];
-	bottomColor			 = [[NSColor colorWithCalibratedWhite:(230.0f / 255.0f) alpha:1] retain];
-	sideInsetColor		 = [[NSColor colorWithCalibratedWhite:(255.0f / 255.0f) alpha:0.5] retain];
-	borderedTopLineColor = [[NSColor colorWithCalibratedWhite:(190.0f / 255.0f) alpha:1] retain];
+	topLineColor		 = [NSColor colorWithCalibratedWhite:(202.0f / 255.0f) alpha:1];
+	bottomLineColor		 = [NSColor colorWithCalibratedWhite:(170.0f / 255.0f) alpha:1];
+    topColor			 = [NSColor colorWithCalibratedWhite:(253.0f / 255.0f) alpha:1];
+    middleTopColor		 = [NSColor colorWithCalibratedWhite:(242.0f / 255.0f) alpha:1];
+    middleBottomColor	 = [NSColor colorWithCalibratedWhite:(230.0f / 255.0f) alpha:1];
+	bottomColor			 = [NSColor colorWithCalibratedWhite:(230.0f / 255.0f) alpha:1];
+	sideInsetColor		 = [NSColor colorWithCalibratedWhite:(255.0f / 255.0f) alpha:0.5];
+	borderedTopLineColor = [NSColor colorWithCalibratedWhite:(190.0f / 255.0f) alpha:1];
 
 	gradient			 = [[NSGradient alloc] initWithColorsAndLocations:
 						   topColor, (CGFloat)0.0,
@@ -50,8 +50,8 @@ + (void)initialize;
 						   bottomColor, (CGFloat)1.0,
 						   nil];
 
-	resizeHandleColor	 = [[NSColor colorWithCalibratedWhite:(0.0f / 255.0f) alpha:0.598] retain];
-	resizeInsetColor	 = [[NSColor colorWithCalibratedWhite:(255.0f / 255.0f) alpha:0.55] retain];
+	resizeHandleColor	 = [NSColor colorWithCalibratedWhite:(0.0f / 255.0f) alpha:0.598];
+	resizeInsetColor	 = [NSColor colorWithCalibratedWhite:(255.0f / 255.0f) alpha:0.55];
 }
 
 - (id)initWithFrame:(NSRect)frame 
@@ -98,7 +98,7 @@ - (void)awakeFromNib
 	if (splitView != nil && [splitView isVertical] && [self isResizable])
 	{
 		if ([splitView delegate] != nil && ([[splitView delegate] isKindOfClass:[BWAnchoredButtonBar class]] ||
-											[splitView isKindOfClass:[BWSplitView class]] && [[(BWSplitView *)splitView secondaryDelegate] isKindOfClass:[BWAnchoredButtonBar class]]))
+											([splitView isKindOfClass:[BWSplitView class]] && [[(BWSplitView *)splitView secondaryDelegate] isKindOfClass:[BWAnchoredButtonBar class]])))
 		{
 			// There's already an Anchored Button Bar set as the delegate so we need to set ourself as the split view delegate on
 			// the button bar. But since there can be multiple button bars, we need to set ourself as the delegate on the last
@@ -307,7 +307,6 @@ - (void)dealloc
 	if ([splitView delegate] == self)
 		[splitView setDelegate:nil];
 
-	[super dealloc];
 }
 
 #pragma mark NSSplitView Delegate Methods

BWGradientBox.h

@@ -17,7 +17,7 @@
 	BOOL hasTopBorder, hasBottomBorder, hasGradient, hasFillColor;
 }
 
-@property (nonatomic, retain) NSColor *fillStartingColor, *fillEndingColor, *fillColor, *topBorderColor, *bottomBorderColor;
+@property (nonatomic, strong) NSColor *fillStartingColor, *fillEndingColor, *fillColor, *topBorderColor, *bottomBorderColor;
 @property float topInsetAlpha, bottomInsetAlpha;
 @property BOOL hasTopBorder, hasBottomBorder, hasGradient, hasFillColor;
 

BWGradientBox.m

@@ -76,7 +76,6 @@ - (void)drawRect:(NSRect)rect
 	{
 		NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:fillStartingColor endingColor:fillEndingColor];
 		[gradient drawInRect:self.bounds angle:90];
-		[gradient release];
 	}
 	else
 	{
@@ -119,8 +118,7 @@ - (void)setFillColor:(NSColor *)color
 {
 	if (fillColor != color) 
 	{
-        [fillColor release];
-        fillColor = [color retain];
+        fillColor = color;
 
 		[self setNeedsDisplay:YES];
     }
@@ -130,8 +128,7 @@ - (void)setFillStartingColor:(NSColor *)color
 {
 	if (fillStartingColor != color) 
 	{
-        [fillStartingColor release];
-        fillStartingColor = [color retain];
+        fillStartingColor = color;
 
 		[self setNeedsDisplay:YES];
     }
@@ -141,8 +138,7 @@ - (void)setFillEndingColor:(NSColor *)color
 {
 	if (fillEndingColor != color) 
 	{
-        [fillEndingColor release];
-        fillEndingColor = [color retain];
+        fillEndingColor = color;
 
 		[self setNeedsDisplay:YES];
     }
@@ -152,8 +148,7 @@ - (void)setTopBorderColor:(NSColor *)color
 {
 	if (topBorderColor != color) 
 	{
-        [topBorderColor release];
-        topBorderColor = [color retain];
+        topBorderColor = color;
 
 		[self setNeedsDisplay:YES];
     }
@@ -163,22 +158,11 @@ - (void)setBottomBorderColor:(NSColor *)color
 {
 	if (bottomBorderColor != color) 
 	{
-        [bottomBorderColor release];
-        bottomBorderColor = [color retain];
+        bottomBorderColor = color;
 
 		[self setNeedsDisplay:YES];
     }
 }
 
-- (void)dealloc
-{
-	[fillColor release];
-	[fillStartingColor release];
-	[fillEndingColor release];
-	[topBorderColor release];
-	[bottomBorderColor release];
-	
-	[super dealloc];
-}
 
 @end

BWSplitView.h

@@ -8,11 +8,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface BWSplitView : NSSplitView 
+@interface BWSplitView : NSSplitView <NSSplitViewDelegate>
 {
 	NSColor *color;
 	BOOL colorIsEnabled, checkboxIsEnabled, dividerCanCollapse, collapsibleSubviewCollapsed;
-	id secondaryDelegate;
 	NSMutableDictionary *minValues, *maxValues, *minUnits, *maxUnits;
 	NSMutableDictionary *resizableSubviewPreferredProportion, *nonresizableSubviewPreferredSize;
 	NSArray *stateForLastPreferredCalculations;
@@ -24,20 +23,20 @@
 	BOOL isAnimating;
 }
 
-@property (retain) NSMutableDictionary *minValues, *maxValues, *minUnits, *maxUnits;
-@property (retain) NSMutableDictionary *resizableSubviewPreferredProportion, *nonresizableSubviewPreferredSize;
-@property (retain) NSArray *stateForLastPreferredCalculations;
-@property (retain) NSButton *toggleCollapseButton;
+@property (nonatomic, strong) NSMutableDictionary *minValues, *maxValues, *minUnits, *maxUnits;
+@property (strong) NSMutableDictionary *resizableSubviewPreferredProportion, *nonresizableSubviewPreferredSize;
+@property (strong) NSArray *stateForLastPreferredCalculations;
+@property (strong) NSButton *toggleCollapseButton;
 @property (assign) id secondaryDelegate;
-@property BOOL collapsibleSubviewCollapsed;
+@property (nonatomic) BOOL collapsibleSubviewCollapsed;
 @property int collapsiblePopupSelection;
 @property BOOL dividerCanCollapse;
 
 // The split view divider color
 @property (copy) NSColor *color;
 
 // Flag for whether a custom divider color is enabled. If not, the standard divider color is used.
-@property BOOL colorIsEnabled;
+@property (nonatomic) BOOL colorIsEnabled;
 
 // Call this method to collapse or expand a subview configured as collapsible in the IB inspector.
 - (IBAction)toggleCollapse:(id)sender;

BWSplitView.m

@@ -47,7 +47,7 @@ - (void)resizeAndAdjustSubviews;
 @end
 
 @interface BWSplitView ()
-@property BOOL checkboxIsEnabled;
+@property (nonatomic) BOOL checkboxIsEnabled;
 @end
 
 @implementation BWSplitView
@@ -58,9 +58,9 @@ @implementation BWSplitView
 
 + (void)initialize;
 {
-    borderColor        = [[NSColor colorWithCalibratedWhite:(165.0f / 255.0f) alpha:1] retain];
-    gradientStartColor = [[NSColor colorWithCalibratedWhite:(253.0f / 255.0f) alpha:1] retain];
-    gradientEndColor   = [[NSColor colorWithCalibratedWhite:(222.0f / 255.0f) alpha:1] retain];
+    borderColor        = [NSColor colorWithCalibratedWhite:(165.0f / 255.0f) alpha:1];
+    gradientStartColor = [NSColor colorWithCalibratedWhite:(253.0f / 255.0f) alpha:1];
+    gradientEndColor   = [NSColor colorWithCalibratedWhite:(222.0f / 255.0f) alpha:1];
 
     gradient           = [[NSGradient alloc] initWithStartingColor:gradientStartColor endingColor:gradientEndColor];
 
@@ -312,7 +312,7 @@ - (void)setMinSizeForCollapsibleSubview:(NSNumber *)minSize
 {
 	if ([self hasCollapsibleSubview])
 	{
-		NSMutableDictionary *tempMinValues = [[[self minValues] mutableCopy] autorelease];
+		NSMutableDictionary *tempMinValues = [[self minValues] mutableCopy];
 		[tempMinValues setObject:minSize forKey:[NSNumber numberWithInt:[[self subviews] indexOfObject:[self collapsibleSubview]]]];
 		[self setMinValues:tempMinValues];
 	}
@@ -322,7 +322,7 @@ - (void)removeMinSizeForCollapsibleSubview
 {
 	if ([self hasCollapsibleSubview])
 	{
-		NSMutableDictionary *tempMinValues = [[[self minValues] mutableCopy] autorelease];
+		NSMutableDictionary *tempMinValues = [[self minValues] mutableCopy];
 		[tempMinValues removeObjectForKey:[NSNumber numberWithInt:[[self subviews] indexOfObject:[self collapsibleSubview]]]];
 		[self setMinValues:tempMinValues];
 	}
@@ -349,7 +349,7 @@ - (IBAction)toggleCollapse:(id)sender
 	// We'll later remove the min size temporarily while animating and then restore it.
 	BOOL hasMinSize = NO;
 	NSNumber *minSize = [minValues objectForKey:[NSNumber numberWithInt:[[self subviews] indexOfObject:[self collapsibleSubview]]]];
-	minSize = [[minSize copy] autorelease];
+	minSize = [minSize copy];
 
 	if (minSize != nil || [minSize intValue] != 0)
 		hasMinSize = YES;
@@ -715,6 +715,13 @@ - (void)splitViewWillResizeSubviews:(NSNotification *)aNotification
 		[secondaryDelegate splitViewWillResizeSubviews:aNotification];
 }
 
+- (BOOL)splitView:(NSSplitView *)splitView shouldAdjustSizeOfSubview:(NSView *)view
+{
+	if ([secondaryDelegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)])
+		return [secondaryDelegate splitView:splitView shouldAdjustSizeOfSubview:view];
+	return YES;
+}
+
 #pragma mark - Resize Subviews Delegate Method and Helper Methods
 
 - (int)resizableSubviews
@@ -907,8 +914,8 @@ - (void)correctCollapsiblePreferredProportionOrSize;
 	if (![self hasCollapsibleSubview])
 		return;
 
-	NSMutableDictionary *preferredProportions = [[[self resizableSubviewPreferredProportion] mutableCopy] autorelease];
-	NSMutableDictionary *preferredSizes = [[[self nonresizableSubviewPreferredSize] mutableCopy] autorelease];
+	NSMutableDictionary *preferredProportions = [[self resizableSubviewPreferredProportion] mutableCopy];
+	NSMutableDictionary *preferredSizes = [[self nonresizableSubviewPreferredSize] mutableCopy];
 
 	NSNumber *key = [NSNumber numberWithInt:[self collapsibleSubviewIndex]];
 	NSView *subview = [self collapsibleSubview];
@@ -1070,8 +1077,8 @@ - (void)resizeAndAdjustSubviews;
 	// TODO: Could add a special case for resizableSubviewsTotalAvailableSize <= 0 : just set all resizable subviews to minimum size 
 
 	// Make array of all the resizable subviews indexes
-	NSMutableArray *resizableSubviewIndexes = [[[resizableSubviewPreferredProportion allKeys] mutableCopy] autorelease];
-	[resizableSubviewIndexes sortUsingDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"self" ascending:YES] autorelease]]];
+	NSMutableArray *resizableSubviewIndexes = [[resizableSubviewPreferredProportion allKeys] mutableCopy];
+	[resizableSubviewIndexes sortUsingDescriptors:[NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"self" ascending:YES]]];
 
 	// Loop until none of the resizable subviews' constraints are violated
 	CGFloat proportionTotal = 1;
@@ -1176,8 +1183,8 @@ - (void)resizeAndAdjustSubviews;
 		if (RESIZE_DEBUG_LOGS) NSLog(@"newSubviewSizes after nonresizable proportional resizing: %@", newSubviewSizes);
 
 		// Make array of all the non-resizable subviews indexes
-		NSMutableArray *nonresizableSubviewIndexes = [[[nonresizableSubviewPreferredSize allKeys] mutableCopy] autorelease];
-		[nonresizableSubviewIndexes sortUsingDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"self" ascending:YES] autorelease]]];
+		NSMutableArray *nonresizableSubviewIndexes = [[nonresizableSubviewPreferredSize allKeys] mutableCopy];
+		[nonresizableSubviewIndexes sortUsingDescriptors:[NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"self" ascending:YES]]];
 
 		// Loop until none of the non-resizable subviews' constraints are violated
 		CGFloat proportionTotal = 1;
@@ -1369,7 +1376,6 @@ - (void)setColor:(NSColor *)aColor
 {
 	if (color != aColor)
 	{
-		[color release];
 		color = [aColor copy];
 	}
 
@@ -1379,56 +1385,42 @@ - (void)setColor:(NSColor *)aColor
 - (NSColor *)color
 {
 	if (color == nil)
-		color = [[NSColor blackColor] retain];
+		color = [NSColor blackColor];
 
-    return [[color retain] autorelease]; 
+    return color; 
 }
 
 - (NSMutableDictionary *)minValues
 {
 	if (minValues == nil)
 		minValues = [NSMutableDictionary new];
 
-    return [[minValues retain] autorelease]; 
+    return minValues; 
 }
 
 - (NSMutableDictionary *)maxValues
 {
 	if (maxValues == nil)
 		maxValues = [NSMutableDictionary new];
 
-    return [[maxValues retain] autorelease]; 
+    return maxValues; 
 }
 
 - (NSMutableDictionary *)minUnits
 {
 	if (minUnits == nil)
 		minUnits = [NSMutableDictionary new];
 
-    return [[minUnits retain] autorelease]; 
+    return minUnits; 
 }
 
 - (NSMutableDictionary *)maxUnits
 {
 	if (maxUnits == nil)
 		maxUnits = [NSMutableDictionary new];
 
-    return [[maxUnits retain] autorelease]; 
+    return maxUnits; 
 }
 
-- (void)dealloc
-{
-	[color release];
-	[minValues release];
-	[maxValues release];
-	[minUnits release];
-	[maxUnits release];
-	[resizableSubviewPreferredProportion release];
-	[nonresizableSubviewPreferredSize release];
-	[toggleCollapseButton release];
-	[stateForLastPreferredCalculations release];
-		
-	[super dealloc];
-}
 
 @end

BWStyledTextField.m

@@ -38,12 +38,12 @@ - (void)setShadowIsBelow:(BOOL)flag
 
 - (NSColor *)shadowColor
 {
-	return [[self cell] shadowColor];
+	return (NSColor *)[[self cell] shadowColor];
 }
 
 - (void)setShadowColor:(NSColor *)color
 {
-	[[self cell] setShadowColor:color];
+	[[self cell] setShadowColor:(__bridge CGColorRef)(color)];
 
 	[self setNeedsDisplay:YES];
 }

BWStyledTextFieldCell.h

@@ -17,7 +17,7 @@
 	NSMutableDictionary *previousAttributes;
 }
 
-@property BOOL shadowIsBelow, hasShadow, hasGradient;
-@property (nonatomic, retain) NSColor *shadowColor, *startingColor, *endingColor, *solidColor;
+@property (nonatomic) BOOL shadowIsBelow, hasShadow, hasGradient;
+@property (nonatomic, strong) NSColor *shadowColor, *startingColor, *endingColor, *solidColor;
 
 @end