adium 2633:4fede163c440: 32/64 bit version of LMX.framework
commits at adium.im
commits at adium.im
Fri Aug 28 21:10:29 UTC 2009
details: http://hg.adium.im/adium/rev/4fede163c440
revision: 2633:4fede163c440
author: Stephen Holt <sholt at adium.im>
date: Fri Aug 28 16:49:04 2009 -0400
32/64 bit version of LMX.framework
Subject: adium 2634:f8f70fff48f1: Type fixes for adium. making it ready for 64-bit compiling.
details: http://hg.adium.im/adium/rev/f8f70fff48f1
revision: 2634:f8f70fff48f1
author: Stephen Holt <sholt at adium.im>
date: Fri Aug 28 16:55:29 2009 -0400
Type fixes for adium. making it ready for 64-bit compiling.
Subject: adium 2635:9a03bca30431: SL's NSSound isn't broken like 10.5's is, so use it for x86_64 builds, which will never run on 10.5.
details: http://hg.adium.im/adium/rev/9a03bca30431
revision: 2635:9a03bca30431
author: Stephen Holt <sholt at adium.im>
date: Fri Aug 28 17:16:21 2009 -0400
SL's NSSound isn't broken like 10.5's is, so use it for x86_64 builds, which will never run on 10.5.
Subject: adium 2636:984b2da123cc: Make RBSplitView ready to compile in 64bit.
details: http://hg.adium.im/adium/rev/984b2da123cc
revision: 2636:984b2da123cc
author: Stephen Holt <sholt at adium.im>
date: Fri Aug 28 17:16:25 2009 -0400
Make RBSplitView ready to compile in 64bit.
Subject: adium 2637:1832ae51377b: Silence this warning.
details: http://hg.adium.im/adium/rev/1832ae51377b
revision: 2637:1832ae51377b
author: Stephen Holt <sholt at adium.im>
date: Fri Aug 28 17:16:25 2009 -0400
Silence this warning.
diffs (truncated from 2030 to 1000 lines):
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m
--- a/Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m Fri Aug 28 17:16:25 2009 -0400
@@ -166,7 +166,7 @@
//Find the object with the largest int value
for (index = 0;index < count;index++) {
- int value = [[contentArray objectAtIndex:index] intValue];
+ int value = [[contentArray objectAtIndex:index] integerValue];
if (value > currentMax) {
currentMax = value;
@@ -179,7 +179,7 @@
return currentMax;
} else {
- return [[contentArray objectAtIndex:0] intValue];
+ return [[contentArray objectAtIndex:0] integerValue];
}
}
return 0;
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h
--- a/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h Fri Aug 28 17:16:25 2009 -0400
@@ -29,7 +29,7 @@
* Returns the total height needed to display all rows of the outline view
* @return The total required height
*/
-- (int)totalHeight;
+- (NSInteger)totalHeight;
/*!
* @brief Set if the selection highlight should only be drawn when the outlineView is the main (active) view.
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m
--- a/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m Fri Aug 28 17:16:25 2009 -0400
@@ -366,7 +366,7 @@
return image;
}
-- (int)totalHeight
+- (NSInteger)totalHeight
{
if (totalHeight == -1) {
int numberOfRows = [self numberOfRows];
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/AIUtilities Framework/Source/JVMarkedScroller.m
--- a/Frameworks/AIUtilities Framework/Source/JVMarkedScroller.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/JVMarkedScroller.m Fri Aug 28 17:16:25 2009 -0400
@@ -161,7 +161,7 @@
[super setFloatValue:position];
}
-- (void) setKnobProportion:(float)percent
+- (void) setKnobProportion:(CGFloat)percent
{
if( ! _jumpingToMark ) _currentMark = NSNotFound;
if(([self knobProportion] != percent ) && ( [_marks count] || [_shades count] ) )
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/Adium Framework/Source/AIAbstractAccount.m
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m Fri Aug 28 17:16:25 2009 -0400
@@ -235,7 +235,7 @@
*/
- (int)port
{
- return [[self preferenceForKey:KEY_CONNECT_PORT group:GROUP_ACCOUNT_STATUS] intValue];
+ return [[self preferenceForKey:KEY_CONNECT_PORT group:GROUP_ACCOUNT_STATUS] integerValue];
}
/*!
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m
--- a/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m Fri Aug 28 17:16:25 2009 -0400
@@ -404,7 +404,7 @@
#pragma mark NSFastEnumeration
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
{
- AHMarkedHyperlink *currentLink;
+ AHMarkedHyperlink *currentLink = nil;
NSUInteger fastEnumCount = 0;
while (fastEnumCount < len && nil != (currentLink = [self nextURI])) {
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/LMX.framework/Versions/A/Headers/LMXParser.h
--- a/Frameworks/LMX.framework/Versions/A/Headers/LMXParser.h Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/LMX.framework/Versions/A/Headers/LMXParser.h Fri Aug 28 17:16:25 2009 -0400
@@ -40,25 +40,25 @@
NSString *attributeValue;
off_t charactersRunStartIndex, tokenRunStartIndex, entityNameRunStartIndex, commentRunStartIndex;
off_t greaterThanIndex;
- unsigned reserved: 22;
- unsigned inComment: 1;
+ unsigned reserved:22;
+ unsigned inComment:1;
//Start of a comment: <!--
// End of a comment: -->
- unsigned hasBang: 1; //With has{First,Second}Hyphen, indicates a comment may be about to start (if a < is encountered)
- unsigned hasSecondHyphen: 1; //With hasGreaterThan and hasFirstHyphen, part of the start of a comment
- unsigned hasFirstHyphen: 1; //With hasGreaterThan, 1/3 of the end of a comment; else, 1/3 of the start of a comment
- unsigned hasEqualSign: 1; //An attribute value has been recorded, and a = encountered
- unsigned couldBeEndTag: 1; //A / has been encountered
- unsigned isEmptyTag: 1; //A / was encountered immediately after a >
- unsigned inEntity: 1; //In between & and ;
- unsigned hasHashMark: 1; //A # was just encountered (if this is 1 when the & is encountered, it's a numeric entity; otherwise, the entity ends)
- unsigned noNonWhitespaceSinceTagEnd: 1; //Used by / to check for a <blah/> tag
- unsigned inTag: 1; //In between < and >
- unsigned parsing: 1; //Set to 0 by -pause
+ unsigned hasBang:1; //With has{First,Second}Hyphen, indicates a comment may be about to start (if a < is encountered)
+ unsigned hasSecondHyphen:1; //With hasGreaterThan and hasFirstHyphen, part of the start of a comment
+ unsigned hasFirstHyphen:1; //With hasGreaterThan, 1/3 of the end of a comment; else, 1/3 of the start of a comment
+ unsigned hasEqualSign:1; //An attribute value has been recorded, and a = encountered
+ unsigned couldBeEndTag:1; //A / has been encountered
+ unsigned isEmptyTag:1; //A / was encountered immediately after a >
+ unsigned inEntity:1; //In between & and ;
+ unsigned hasHashMark:1; //A # was just encountered (if this is 1 when the & is encountered, it's a numeric entity; otherwise, the entity ends)
+ unsigned noNonWhitespaceSinceTagEnd:1; //Used by / to check for a <blah/> tag
+ unsigned inTag:1; //In between < and >
+ unsigned parsing:1; //Set to 0 by -pause
char attributeQuoteChar; //One of '"', '\'', or '\0'
}
-//How to get autoreleased parser in only one message instead of three:
+//How to get an autoreleased parser in only one message instead of three:
+ parser;
- initWithData:(NSData *)data;
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/LMX.framework/Versions/A/LMX
Binary file Frameworks/LMX.framework/Versions/A/LMX has changed
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/LMX.framework/Versions/A/Resources/Info.plist
--- a/Frameworks/LMX.framework/Versions/A/Resources/Info.plist Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/LMX.framework/Versions/A/Resources/Info.plist Fri Aug 28 17:16:25 2009 -0400
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/RBSplitView/Palette/RBSplitViewPalette.h
--- a/Frameworks/RBSplitView/Palette/RBSplitViewPalette.h Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/RBSplitView/Palette/RBSplitViewPalette.h Fri Aug 28 17:16:25 2009 -0400
@@ -32,7 +32,7 @@
IBOutlet NSButton* currentMinButton;
IBOutlet NSButton* currentMaxButton;
}
-- (void)setSubview:(NSView*)subview withUndo:(NSUndoManager*)undo frame:(NSRect)frame andAutoresizingMask:(unsigned int)autoresizingMask;
+- (void)setSubview:(NSView*)subview withUndo:(NSUndoManager*)undo frame:(NSRect)frame andAutoresizingMask:(NSUInteger)autoresizingMask;
@end
// This class implements the RBSplitSubview size inspector.
@@ -81,7 +81,7 @@
// This category adds some functionality to RBSplitView to support Interface Builder stuff.
@interface RBSplitView (RBSVIBAdditions)
-- (void)ibSetNumberOfSubviews:(unsigned)count;
+- (void)ibSetNumberOfSubviews:(NSUInteger)count;
- (BOOL)ibHandleMouseDown:(NSEvent*)theEvent in:(NSView<IBEditors>*)viewEditor;
- (void)ibRestoreState:(NSString*)string in:(NSView<IBEditors>*)viewEditor;
@end
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/RBSplitView/Palette/RBSplitViewPalette.m
--- a/Frameworks/RBSplitView/Palette/RBSplitViewPalette.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/RBSplitView/Palette/RBSplitViewPalette.m Fri Aug 28 17:16:25 2009 -0400
@@ -69,18 +69,18 @@
RBSplitView* sv = [suv splitView];
[collapseButton setState:[suv canCollapse]];
[[identifierValue cellAtIndex:0] setStringValue:[suv identifier]];
- [[minimumValue cellAtIndex:0] setFloatValue:[suv minDimension]];
+ [[minimumValue cellAtIndex:0] setDoubleValue:[suv minDimension]];
// No max limit is indicated by a blank value; don't want to confuse the user with 1000000.0
- float dimension = [suv maxDimension];
+ CGFloat dimension = [suv maxDimension];
if (dimension<WAYOUT) {
- [[maximumValue cellAtIndex:0] setFloatValue:dimension];
+ [[maximumValue cellAtIndex:0] setDoubleValue:dimension];
} else {
[[maximumValue cellAtIndex:0] setStringValue:@""];
}
- unsigned position = [suv position];
- [[positionValue cellAtIndex:0] setIntValue:position];
- [positionStepper setIntValue:position];
- [[tagValue cellAtIndex:0] setIntValue:[suv tag]];
+ NSUInteger position = [suv position];
+ [[positionValue cellAtIndex:0] setIntegerValue:position];
+ [positionStepper setIntegerValue:position];
+ [[tagValue cellAtIndex:0] setIntegerValue:[suv tag]];
[adjustButton setEnabled:([[suv subviews] count]==1)];
[sv adjustSubviews];
[[self inspectedDocument] drawObject:sv];
@@ -88,7 +88,7 @@
}
// Adjust enclosed subview with undo support.
-- (void)setSubview:(NSView*)subview withUndo:(NSUndoManager*)undo frame:(NSRect)frame andAutoresizingMask:(unsigned int)autoresizingMask {
+- (void)setSubview:(NSView*)subview withUndo:(NSUndoManager*)undo frame:(NSRect)frame andAutoresizingMask:(NSUInteger)autoresizingMask {
if (undo) {
[[undo prepareWithInvocationTarget:self] setSubview:subview withUndo:undo frame:[subview frame] andAutoresizingMask:[subview autoresizingMask]];
[undo setActionName:@"Adjust Enclosed"];
@@ -123,36 +123,36 @@
} else if (sender==identifierValue) {
[suv setIdentifier:[[identifierValue cellAtIndex:0] stringValue]];
} else if ((sender==minimumValue)||(sender==maximumValue)) {
- [suv setMinDimension:[[minimumValue cellAtIndex:0] floatValue] andMaxDimension:[[maximumValue cellAtIndex:0] floatValue]];
+ [suv setMinDimension:[[minimumValue cellAtIndex:0] doubleValue] andMaxDimension:[[maximumValue cellAtIndex:0] doubleValue]];
// No max limit is indicated by a blank value; don't want to confuse the user with 1000000.0
- float dimension = [suv maxDimension];
+ CGFloat dimension = [suv maxDimension];
if (dimension<WAYOUT) {
- [[maximumValue cellAtIndex:0] setFloatValue:dimension];
+ [[maximumValue cellAtIndex:0] setDoubleValue:dimension];
} else {
[[maximumValue cellAtIndex:0] setStringValue:@""];
}
} else if (sender==currentMinButton) {
- float dim = [suv dimension];
+ CGFloat dim = [suv dimension];
[suv setMinDimension:dim andMaxDimension:[suv maxDimension]];
- [[minimumValue cellAtIndex:0] setFloatValue:dim];
+ [[minimumValue cellAtIndex:0] setDoubleValue:dim];
} else if (sender==currentMaxButton) {
- float dim = [suv dimension];
+ CGFloat dim = [suv dimension];
[suv setMinDimension:[suv minDimension] andMaxDimension:dim];
- [[maximumValue cellAtIndex:0] setFloatValue:dim];
+ [[maximumValue cellAtIndex:0] setDoubleValue:dim];
} else if (sender==positionValue) {
- unsigned position = [[positionValue cellAtIndex:0] intValue];
+ NSUInteger position = [[positionValue cellAtIndex:0] integerValue];
[suv setPosition:position];
position = [suv position];
- [[positionValue cellAtIndex:0] setIntValue:position];
- [positionStepper setIntValue:position];
+ [[positionValue cellAtIndex:0] setIntegerValue:position];
+ [positionStepper setIntegerValue:position];
} else if (sender==positionStepper) {
- unsigned position = [positionStepper intValue];
+ NSUInteger position = [positionStepper integerValue];
[suv setPosition:position];
position = [suv position];
- [[positionValue cellAtIndex:0] setIntValue:position];
- [positionStepper setIntValue:position];
+ [[positionValue cellAtIndex:0] setIntegerValue:position];
+ [positionStepper setIntegerValue:position];
} else if (sender==tagValue) {
- [suv setTag:[[tagValue cellAtIndex:0] intValue]];
+ [suv setTag:[[tagValue cellAtIndex:0] integerValue]];
}
[sv adjustSubviews];
[[self inspectedDocument] drawObject:sv];
@@ -176,12 +176,14 @@
- (void)revert:(id)sender {
RBSplitSubview* suv = (RBSplitSubview*)[self object];
RBSplitView* sv = [suv ibSplitView];
- [[sizeValue cellAtIndex:0] setFloatValue:[suv dimension]];
+ [[sizeValue cellAtIndex:0] setDoubleValue:[suv dimension]];
// As a convenience, we show the minimum and (if present) maximum dimensions.
- float limit = [suv maxDimension];
+ CGFloat limit = [suv maxDimension];
if (limit>=WAYOUT) {
+#warning 64BIT: Check formatting arguments
[sizeLimits setStringValue:[NSString stringWithFormat:@"Minimum %g",[suv minDimension]]];
} else {
+#warning 64BIT: Check formatting arguments
[sizeLimits setStringValue:[NSString stringWithFormat:@"Minimum %g\nMaximum %g",[suv minDimension],[suv maxDimension]]];
}
[collapsedButton setEnabled:[suv canCollapse]];
@@ -198,8 +200,8 @@
[self beginUndoGrouping];
[self noteAttributesWillChangeForObject:suv];
if (sender==sizeValue) {
- [suv setDimension:[[sizeValue cellAtIndex:0] floatValue]];
- [[sizeValue cellAtIndex:0] setFloatValue:[suv dimension]];
+ [suv setDimension:[[sizeValue cellAtIndex:0] doubleValue]];
+ [[sizeValue cellAtIndex:0] setDoubleValue:[suv dimension]];
} else if (sender==collapsedButton) {
if ([sender state]) {
[suv collapse];
@@ -229,14 +231,14 @@
[[autosaveName cellAtIndex:0] setStringValue:[sv autosaveName]];
// Show clearColor if background is nil.
[hiddenButton setState:[sv isHidden]];
- int count = [[sv subviews] count];
- [[subviewCount cellAtIndex:0] setIntValue:count];
- [subviewStepper setIntValue:count];
- [[tagValue cellAtIndex:0] setIntValue:[sv tag]];
- float divt = [sv RB___dividerThickness];
+ NSInteger count = [[sv subviews] count];
+ [[subviewCount cellAtIndex:0] setIntegerValue:count];
+ [subviewStepper setIntegerValue:count];
+ [[tagValue cellAtIndex:0] setIntegerValue:[sv tag]];
+ CGFloat divt = [sv RB___dividerThickness];
[thicknessValue setEnabled:(divt>0.0)||![sv divider]];
[useButton setState:divt<1.0];
- [[thicknessValue cellAtIndex:0] setFloatValue:[sv dividerThickness]];
+ [[thicknessValue cellAtIndex:0] setDoubleValue:[sv dividerThickness]];
RBSplitView* suv = [sv ibSplitView];
BOOL notc = ![sv isCoupled];
[coupledButton setState:!notc];
@@ -247,17 +249,17 @@
[autosaveName setNextKeyView:suv?positionValue:subviewCount];
[collapseButton setState:[sv canCollapse]];
[[identifierValue cellAtIndex:0] setStringValue:[sv identifier]];
- [[minimumValue cellAtIndex:0] setFloatValue:[sv minDimension]];
+ [[minimumValue cellAtIndex:0] setDoubleValue:[sv minDimension]];
// No max limit is indicated by a blank value; don't want to confuse the user with 1000000.0
- float dimension = [sv maxDimension];
+ CGFloat dimension = [sv maxDimension];
if (dimension<WAYOUT) {
- [[maximumValue cellAtIndex:0] setFloatValue:dimension];
+ [[maximumValue cellAtIndex:0] setDoubleValue:dimension];
} else {
[[maximumValue cellAtIndex:0] setStringValue:@""];
}
- unsigned position = [sv position];
- [[positionValue cellAtIndex:0] setIntValue:position];
- [positionStepper setIntValue:position];
+ NSUInteger position = [sv position];
+ [[positionValue cellAtIndex:0] setIntegerValue:position];
+ [positionStepper setIntegerValue:position];
[orientation selectCellWithTag:[sv isVertical]];
NSColor* background = [sv background];
[backgroundWell setColor:background?background:[NSColor clearColor]];
@@ -267,6 +269,7 @@
[[[dividerImage menu] itemAtIndex:0] setImage:divider];
[dividerImage setEnabled:notc];
NSSize size = divider?[divider size]:NSZeroSize;
+#warning 64BIT: Check formatting arguments
[dividerSize setStringValue:notc?[NSString stringWithFormat:@"(%g x %g)",size.width,size.height]:
@"(from containing view)"];
[sv adjustSubviews];
@@ -301,9 +304,9 @@
} else {
[sv setDividerThickness:[sv dividerThickness]];
}
- float divt = [sv RB___dividerThickness];
+ CGFloat divt = [sv RB___dividerThickness];
[thicknessValue setEnabled:(divt>0.0)||![sv divider]];
- [[thicknessValue cellAtIndex:0] setFloatValue:[sv dividerThickness]];
+ [[thicknessValue cellAtIndex:0] setDoubleValue:[sv dividerThickness]];
[useButton setState:divt<1.0];
} else if (sender==coupledButton) {
[sv setCoupled:[coupledButton state]];
@@ -316,34 +319,35 @@
[[[dividerImage menu] itemAtIndex:0] setImage:divider];
[dividerImage setEnabled:notc];
NSSize size = divider?[divider size]:NSZeroSize;
+#warning 64BIT: Check formatting arguments
[dividerSize setStringValue:notc?[NSString stringWithFormat:@"(%g x %g)",size.width,size.height]:
@"(from containing view)"];
} else if (sender==identifierValue) {
[sv setIdentifier:[[identifierValue cellAtIndex:0] stringValue]];
} else if ((sender==minimumValue)||(sender==maximumValue)) {
- [sv setMinDimension:[[minimumValue cellAtIndex:0] floatValue] andMaxDimension:[[maximumValue cellAtIndex:0] floatValue]];
+ [sv setMinDimension:[[minimumValue cellAtIndex:0] doubleValue] andMaxDimension:[[maximumValue cellAtIndex:0] doubleValue]];
// No max limit is indicated by a blank value; don't want to confuse the user with 1000000.0
- float dimension = [sv maxDimension];
+ CGFloat dimension = [sv maxDimension];
if (dimension<WAYOUT) {
- [[maximumValue cellAtIndex:0] setFloatValue:dimension];
+ [[maximumValue cellAtIndex:0] setDoubleValue:dimension];
} else {
[[maximumValue cellAtIndex:0] setStringValue:@""];
}
} else if (sender==positionValue) {
- unsigned position = [[positionValue cellAtIndex:0] intValue];
+ NSUInteger position = [[positionValue cellAtIndex:0] integerValue];
[sv setPosition:position];
position = [sv position];
- [[positionValue cellAtIndex:0] setIntValue:position];
- [positionStepper setIntValue:position];
+ [[positionValue cellAtIndex:0] setIntegerValue:position];
+ [positionStepper setIntegerValue:position];
} else if (sender==positionStepper) {
- unsigned position = [positionStepper intValue];
+ NSUInteger position = [positionStepper integerValue];
[sv setPosition:position];
position = [sv position];
- [[positionValue cellAtIndex:0] setIntValue:position];
- [positionStepper setIntValue:position];
+ [[positionValue cellAtIndex:0] setIntegerValue:position];
+ [positionStepper setIntegerValue:position];
} else if (sender==thicknessValue) {
- [sv setDividerThickness:[[thicknessValue cellAtIndex:0] floatValue]];
- [[thicknessValue cellAtIndex:0] setFloatValue:[sv dividerThickness]];
+ [sv setDividerThickness:[[thicknessValue cellAtIndex:0] doubleValue]];
+ [[thicknessValue cellAtIndex:0] setDoubleValue:[sv dividerThickness]];
} else if (sender==autosaveName) {
[sv setAutosaveName:[[autosaveName cellAtIndex:0] stringValue] recursively:YES];
} else if (sender==backgroundWell) {
@@ -380,19 +384,19 @@
} else if (sender==orientation) {
[sv setVertical:[[orientation selectedCell] tag]];
} else if (sender==subviewCount) {
- int count = [[subviewCount cellAtIndex:0] intValue];
+ NSInteger count = [[subviewCount cellAtIndex:0] integerValue];
[sv ibSetNumberOfSubviews:count];
count = [sv numberOfSubviews];
- [subviewStepper setIntValue:count];
- [[subviewCount cellAtIndex:0] setIntValue:count];
+ [subviewStepper setIntegerValue:count];
+ [[subviewCount cellAtIndex:0] setIntegerValue:count];
} else if (sender==subviewStepper) {
- int count = [subviewStepper intValue];
+ NSInteger count = [subviewStepper integerValue];
[sv ibSetNumberOfSubviews:count];
count = [sv numberOfSubviews];
- [subviewStepper setIntValue:count];
- [[subviewCount cellAtIndex:0] setIntValue:count];
+ [subviewStepper setIntegerValue:count];
+ [[subviewCount cellAtIndex:0] setIntegerValue:count];
} else if (sender==tagValue) {
- [sv setTag:[[tagValue cellAtIndex:0] intValue]];
+ [sv setTag:[[tagValue cellAtIndex:0] integerValue]];
}
// If we're nested, adjust and redraw the containing RBSplitView.
RBSplitView* svv = [sv splitView];
@@ -438,7 +442,7 @@
rect = [self bounds];
// Draws the bezel around the subview.
static NSRectEdge mySides[] = {NSMinXEdge,NSMaxYEdge,NSMinXEdge,NSMinYEdge,NSMaxXEdge,NSMaxYEdge,NSMaxXEdge,NSMinYEdge};
- static float myGrays[] = {0.5,0.5,1.0,1.0,1.0,1.0,0.5,0.5};
+ static CGFloat myGrays[] = {0.5,0.5,1.0,1.0,1.0,1.0,0.5,0.5};
rect = NSDrawTiledRects(rect,rect,mySides,myGrays,8);
static NSColor* brown = nil;
if (!brown) {
@@ -452,6 +456,7 @@
attributes = [[NSDictionary alloc] initWithObjectsAndKeys:[NSColor whiteColor],NSForegroundColorAttributeName,[NSFont systemFontOfSize:12.0],NSFontAttributeName,nil];
}
// Sets up the "nnnpx" string and draws it centered into the subview.
+#warning 64BIT: Check formatting arguments
NSAttributedString* label = [[[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%gpx",[self dimension]] attributes:attributes] autorelease];
NSSize labelSize = [label size];
rect.origin.y += floorf((rect.size.height-labelSize.height)/2.0);
@@ -529,8 +534,8 @@
- (NSSize)minimumFrameSizeFromKnobPosition:(IBKnobPosition)position {
RBSplitView* sv = [self asSplitView];
if (sv) {
- unsigned count = [sv numberOfSubviews];
- float size = 16.0*count+[sv dividerThickness]*(count-1);
+ NSUInteger count = [sv numberOfSubviews];
+ CGFloat size = 16.0*count+[sv dividerThickness]*(count-1);
return [sv isHorizontal]?NSMakeSize(16.0,size):NSMakeSize(size,16.0);
}
return NSMakeSize(16.0,16.0);
@@ -691,8 +696,8 @@
// This is called when setting the number of subviews from the inspector. There's some IB stuff
// interleaved to tweak the outline hierarchy.
-- (void)ibSetNumberOfSubviews:(unsigned)count {
- unsigned now = [self numberOfSubviews];
+- (void)ibSetNumberOfSubviews:(NSUInteger)count {
+ NSUInteger now = [self numberOfSubviews];
NSRect frame = NSZeroRect;
id<IBDocuments> document = nil;
if (now<count) {
@@ -729,9 +734,9 @@
}
NSPoint where = [self convertPoint:[theEvent locationInWindow] fromView:nil];
NSArray* subviews = [self subviews];
- int subcount = [subviews count];
+ NSInteger subcount = [subviews count];
if (subcount>1) {
- int i;
+ NSInteger i;
NSPoint base = NSZeroPoint;
// Strangely enough, when this is called the view hierarchy isn't inserted into a window at all, but rather
// into a (non-visible) container view, so we have to account for its frame offset.
@@ -764,7 +769,7 @@
NSRect* divi = ÷rs[i];
if ([self mouse:where inRect:*divi]) {
// Found one; record the offset within the divider rectangle and show the cursor.
- float offset = DIM(where)-DIM(divi->origin);
+ CGFloat offset = DIM(where)-DIM(divi->origin);
[[NSCursor closedHandCursor] push];
// Save state for undoing the divider drag.
NSUndoManager* undo = [viewEditor undoManager];
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/RBSplitView/Source/RBSplitSubview.h
--- a/Frameworks/RBSplitView/Source/RBSplitSubview.h Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/RBSplitView/Source/RBSplitSubview.h Fri Aug 28 17:16:25 2009 -0400
@@ -24,7 +24,7 @@
// Most getter methods simply return the corresponding instance variable, so with some care, subclasses
// could reference them directly.
NSString* identifier; // An identifier string for the subview, default is @"".
- int tag; // A tag integer for the subview, default is 0.
+ NSInteger tag; // A tag integer for the subview, default is 0.
CGFloat minDimension; // The minimum dimension. Must be 1.0 or any larger integer.
CGFloat maxDimension; // The maximum dimension. Must be at least equal to the minDimension.
// Set to a large number if there's no maximum.
@@ -70,11 +70,11 @@
- (BOOL)splitViewIsHorizontal;
// Returns the number of subviews. Just a convenience method.
-- (unsigned)numberOfSubviews;
+- (NSUInteger)numberOfSubviews;
// Sets and gets the tag.
-- (void)setTag:(int)theTag;
-- (int)tag;
+- (void)setTag:(NSInteger)theTag;
+- (NSInteger)tag;
// Sets and gets the identifier string. Will never be nil.
- (void)setIdentifier:(NSString*)aString;
@@ -84,8 +84,8 @@
// or top to bottom. Setting it will move the subview to another position without changing its size,
// status or attributes. Set position to 0 to move it to the start, or to some large number to move it
// to the end of the RBSplitView.
-- (unsigned)position;
-- (void)setPosition:(unsigned)newPosition;
+- (NSUInteger)position;
+- (void)setPosition:(NSUInteger)newPosition;
// Returns YES if the subview is collapsed. Collapsed subviews are squashed down to zero but never
// made smaller than the minimum dimension as far as their own subviews are concerned. If the
@@ -107,17 +107,17 @@
// Sets and gets the minimum and maximum dimensions. They're set at the same time to make sure values
// are consistent. Despite being floats, they'll always have integer values. The minimum value for the
// minimum is 1.0. Pass 0.0 for the maximum to set it to some huge number.
-- (float)minDimension;
-- (float)maxDimension;
-- (void)setMinDimension:(float)newMinDimension andMaxDimension:(float)newMaxDimension;
+- (CGFloat)minDimension;
+- (CGFloat)maxDimension;
+- (void)setMinDimension:(CGFloat)newMinDimension andMaxDimension:(CGFloat)newMaxDimension;
// Call this to expand a subview programmatically. It will return the subview's dimension after
// expansion.
-- (float)expand;
+- (CGFloat)expand;
// Call this to collapse a subview programmatically. It will return the negative
// of the subview's dimension _before_ collapsing, or 0.0 if the subview can't be collapsed.
-- (float)collapse;
+- (CGFloat)collapse;
// These calls collapse and expand subviews with animation. They return YES if animation
// startup was successful.
@@ -131,16 +131,16 @@
- (BOOL)expandWithAnimation:(BOOL)animate withResize:(BOOL)resize;
// Returns the current dimension of the subview.
-- (float)dimension;
+- (CGFloat)dimension;
// Sets the current dimension of the subview, subject to the current maximum and minimum.
// If the subview is collapsed, this has no immediate effect.
-- (void)setDimension:(float)value;
+- (void)setDimension:(CGFloat)value;
// This method is used internally when a divider is dragged. It tries to change the subview's dimension
// and returns the actual change, collapsing or expanding whenever possible. You usually won't need
// to call this directly.
-- (float)changeDimensionBy:(float)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move;
+- (CGFloat)changeDimensionBy:(CGFloat)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move;
@end
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/RBSplitView/Source/RBSplitSubview.m
--- a/Frameworks/RBSplitView/Source/RBSplitSubview.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/RBSplitView/Source/RBSplitSubview.m Fri Aug 28 17:16:25 2009 -0400
@@ -144,11 +144,11 @@
// You can use either tags (ints) or identifiers (NSStrings) to identify individual subviews.
// We take care not to have nil identifiers.
-- (void)setTag:(int)theTag {
+- (void)setTag:(NSInteger)theTag {
tag = theTag;
}
-- (int)tag {
+- (NSInteger)tag {
return tag;
}
@@ -169,12 +169,12 @@
// This pair of methods allows you to get and change the position of a subview (within the split view);
// this counts from zero from the left or top of the split view.
-- (unsigned)position {
+- (NSUInteger)position {
RBSplitView* sv = [self splitView];
return sv?[[sv subviews] indexOfObjectIdenticalTo:self]:0;
}
-- (void)setPosition:(unsigned)newPosition {
+- (void)setPosition:(NSUInteger)newPosition {
RBSplitView* sv = [self splitView];
if (sv) {
[self retain];
@@ -239,7 +239,7 @@
// As a convenience to other methods, it returns the subview's dimension after expanding (this may be
// off by 1 pixel due to rounding) or 0.0 if it couldn't be expanded.
// The delegate should not change the subview's frame.
-- (float)expand {
+- (CGFloat)expand {
return [self RB___expandAndSetToMinimum:NO];
}
@@ -248,7 +248,7 @@
// As a convenience to other methods, it returns the negative of the subview's dimension before
// collapsing (or 0.0 if it couldn't be collapsed).
// The delegate should not change the subview's frame.
-- (float)collapse {
+- (CGFloat)collapse {
return [self RB___collapse];
}
@@ -299,21 +299,21 @@
// The minimum dimension ought to be an integer at least equal to 1.0 but we make sure.
// The maximum dimension ought to be an integer at least equal to the minimum. As a convenience,
// pass in zero to set it to some huge number.
-- (float)minDimension {
+- (CGFloat)minDimension {
return minDimension;
}
-- (float)maxDimension {
+- (CGFloat)maxDimension {
return maxDimension;
}
-- (void)setMinDimension:(float)newMinDimension andMaxDimension:(float)newMaxDimension {
+- (void)setMinDimension:(CGFloat)newMinDimension andMaxDimension:(CGFloat)newMaxDimension {
minDimension = MAX(1.0,floorf(newMinDimension));
if (newMaxDimension<1.0) {
newMaxDimension = WAYOUT;
}
maxDimension = MAX(minDimension,floorf(newMaxDimension));
- float dim = [self dimension];
+ CGFloat dim = [self dimension];
if ((dim<minDimension)||(dim>maxDimension)) {
[[self splitView] setMustAdjust];
}
@@ -321,8 +321,8 @@
// This returns the subview's dimension. If it's collapsed, it returns the dimension it would have
// after expanding.
-- (float)dimension {
- float dim = [self RB___visibleDimension];
+- (CGFloat)dimension {
+ CGFloat dim = [self RB___visibleDimension];
if (dim<=0.0) {
dim = [[self splitView] RB___dimensionWithoutDividers]*fraction;
if (dim<minDimension) {
@@ -336,7 +336,7 @@
// Sets the current dimension of the subview, subject to the current maximum and minimum.
// If the subview is collapsed, this will have an effect only after reexpanding.
-- (void)setDimension:(float)value {
+- (void)setDimension:(CGFloat)value {
RBSplitView* sv = [self splitView];
NSSize size = [self frame].size;
BOOL ishor = [sv isHorizontal];
@@ -391,8 +391,8 @@
if (sv) {
BOOL ishor = [sv isHorizontal];
NSRect frame = [self frame];
- float dim = DIM(frame.size);
- float other = OTHER(frame.size);
+ CGFloat dim = DIM(frame.size);
+ CGFloat other = OTHER(frame.size);
// We resize subviews only when we're inside the subview's limits and the containing splitview's limits.
animationData* anim = [self RB___animationData:NO resize:NO];
if ((dim>=(anim&&!anim->resizing?anim->dimension:minDimension))&&(dim<=maxDimension)&&(other>=[sv minDimension])&&(other<=[sv maxDimension])) {
@@ -413,15 +413,15 @@
// This method is used internally when a divider is dragged. It tries to change the subview's dimension
// and returns the actual change, collapsing or expanding whenever possible. You usually won't need
// to call this directly.
-- (float)changeDimensionBy:(float)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move {
+- (CGFloat)changeDimensionBy:(CGFloat)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move {
RBSplitView* sv = [self splitView];
if (!sv||(fabsf(increment)<1.0)) {
return 0.0;
}
BOOL ishor = [sv isHorizontal];
NSRect frame = [self frame];
- float olddim = DIM(frame.size);
- float newdim = MAX(0.0,olddim+increment);
+ CGFloat olddim = DIM(frame.size);
+ CGFloat newdim = MAX(0.0,olddim+increment);
if (newdim<olddim) {
if (newdim<minDimension) {
// Collapse if needed
@@ -443,7 +443,7 @@
newdim = maxDimension;
}
}
- if ((int)newdim!=(int)olddim) {
+ if ((NSInteger)newdim!=(NSInteger)olddim) {
// The dimension has changed.
increment = newdim-olddim;
DIM(frame.size) = newdim;
@@ -460,7 +460,7 @@
}
// This convenience method returns the number of subviews (surprise!)
-- (unsigned)numberOfSubviews {
+- (NSUInteger)numberOfSubviews {
return [[self subviews] count];
}
@@ -472,7 +472,7 @@
id delegate = [sv delegate];
if ([delegate respondsToSelector:@selector(splitView:dividerForPoint:inSubview:)]) {
actDivider = [delegate splitView:sv dividerForPoint:aPoint inSubview:self];
- if ((int)actDivider<(int)([sv RB___numberOfSubviews]-1)) {
+ if ((NSInteger)actDivider<(NSInteger)([sv RB___numberOfSubviews]-1)) {
return self;
}
}
@@ -496,7 +496,7 @@
[[RBSplitView cursor:RBSVDragCursor] push];
NSPoint base = NSZeroPoint;
// Record the current divider coordinate.
- float divc = [sv RB___dividerOrigin:actDivider];
+ CGFloat divc = [sv RB___dividerOrigin:actDivider];
BOOL ishor = [sv isHorizontal];
[sv RB___setDragging:YES];
// Loop while the button is down.
@@ -512,7 +512,7 @@
[sv display];
}
// Change the drag point by the actual amount moved.
- float newc = [sv RB___dividerOrigin:actDivider];
+ CGFloat newc = [sv RB___dividerOrigin:actDivider];
DIM(point) += newc-divc;
divc = newc;
NSEnableScreenUpdates();
@@ -564,9 +564,9 @@
}
if ([coder allowsKeyedCoding]) {
[coder encodeObject:identifier forKey:@"identifier"];
- [coder encodeInt:tag forKey:@"tag"];
- [coder encodeFloat:minDimension forKey:@"minDimension"];
- [coder encodeFloat:maxDimension forKey:@"maxDimension"];
+ [coder encodeInteger:tag forKey:@"tag"];
+ [coder encodeDouble:minDimension forKey:@"minDimension"];
+ [coder encodeDouble:maxDimension forKey:@"maxDimension"];
[coder encodeDouble:fraction forKey:@"fraction"];
[coder encodeBool:canCollapse forKey:@"canCollapse"];
} else {
@@ -602,9 +602,9 @@
previous = NSZeroRect;
if ([coder allowsKeyedCoding]) {
[self setIdentifier:[coder decodeObjectForKey:@"identifier"]];
- tag = [coder decodeIntForKey:@"tag"];
- minDimension = [coder decodeFloatForKey:@"minDimension"];
- maxDimension = [coder decodeFloatForKey:@"maxDimension"];
+ tag = [coder decodeIntegerForKey:@"tag"];
+ minDimension = [coder decodeDoubleForKey:@"minDimension"];
+ maxDimension = [coder decodeDoubleForKey:@"maxDimension"];
fraction = [coder decodeDoubleForKey:@"fraction"];
canCollapse = [coder decodeBoolForKey:@"canCollapse"];
} else {
@@ -641,7 +641,7 @@
// We want to start (or restart) an animation.
RBSplitView* sv = [self splitView];
if (sv) {
- float dim = [self dimension];
+ CGFloat dim = [self dimension];
// First assume the default time, then ask the delegate.
NSTimeInterval total = dim*(0.2/150.0);
id delegate = [sv delegate];
@@ -684,7 +684,7 @@
BOOL ishor = [sv isHorizontal];
// Continuing animation only makes sense if we still have at least FRAMETIME available.
if (remain>=FRAMETIME) {
- float avg = anim->elapsedTime;
+ CGFloat avg = anim->elapsedTime;
// We try to keep a record of how long it takes, on the average, to resize and adjust
// one animation frame.
if (anim->stepsDone) {
@@ -692,7 +692,7 @@
}
NSTimeInterval delay = MIN(0.0,FRAMETIME-avg);
// We adjust the new dimension proportionally to how much of the designated time has passed.
- float dim = floorf(anim->dimension*(remain-avg)/anim->totalTime);
+ CGFloat dim = floorf(anim->dimension*(remain-avg)/anim->totalTime);
if (dim>4.0) {
if (!anim->collapsing) {
dim = anim->dimension-dim;
@@ -714,8 +714,8 @@
DIM(frame.size) = 0.0;
[self RB___finishCollapse:frame withFraction:anim->dimension/[sv RB___dimensionWithoutDividers]];
} else {
- float savemin,savemax;
- float dim = [self RB___setMinAndMaxTo:anim->dimension savingMin:&savemin andMax:&savemax];
+ CGFloat savemin,savemax;
+ CGFloat dim = [self RB___setMinAndMaxTo:anim->dimension savingMin:&savemin andMax:&savemax];
DIM(frame.size) = dim;
[self RB___finishExpand:frame withFraction:0.0];
minDimension = savemin;
@@ -739,7 +739,7 @@
// This internal method returns the actual visible dimension of the subview. Differs from -dimension in
// that it returns 0.0 if the subview is collapsed.
-- (float)RB___visibleDimension {
+- (CGFloat)RB___visibleDimension {
BOOL ishor = [self splitViewIsHorizontal];
NSRect frame = [self frame];
return MAX(0.0,DIM(frame.size));
@@ -755,8 +755,8 @@
cache->constrain = NO;
}
-- (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(float)value {
- float dim = [self RB___visibleDimension];
+- (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(CGFloat)value {
+ CGFloat dim = [self RB___visibleDimension];
if (cache->size>=1.0) {
// New state is not collapsed.
if (dim>=1.0) {
@@ -781,7 +781,7 @@
// This internal method sets minimum and maximum values to the same value, saves the old values,
// and returns the new value (which will be limited to the old values).
-- (float)RB___setMinAndMaxTo:(float)value savingMin:(float*)oldmin andMax:(float*)oldmax {
+- (CGFloat)RB___setMinAndMaxTo:(CGFloat)value savingMin:(CGFloat*)oldmin andMax:(CGFloat*)oldmax {
*oldmin = [self minDimension];
*oldmax = [self maxDimension];
if (value<*oldmin) {
@@ -815,8 +815,8 @@
// This internal method collapses a subview.
// It returns the negative of the size of the subview before collapsing, or 0.0 if it wasn't collapsed.
-- (float)RB___collapse {
- float result = 0.0;
+- (CGFloat)RB___collapse {
+ CGFloat result = 0.0;
if (![self isCollapsed]) {
RBSplitView* sv = [self splitView];
if (sv&&[self canCollapse]) {
@@ -850,8 +850,8 @@
// This internal method expands a subview. setToMinimum will usually be YES during a divider drag.
// It returns the size of the subview after expanding, or 0.0 if it wasn't expanded.
-- (float)RB___expandAndSetToMinimum:(BOOL)setToMinimum {
- float result = 0.0;
+- (CGFloat)RB___expandAndSetToMinimum:(BOOL)setToMinimum {
+ CGFloat result = 0.0;
RBSplitView* sv = [self splitView];
if (sv&&[self isCollapsed]) {
NSRect frame = [super frame];
@@ -862,7 +862,7 @@
} else {
result = [sv RB___dimensionWithoutDividers]*frac;
// We need to apply a compensation factor for proportional resizing in adjustSubviews.
- float newdim = floorf((frac>=1.0)?result:result/(1.0-frac));
+ CGFloat newdim = floorf((frac>=1.0)?result:result/(1.0-frac));
DIM(frame.size) = newdim;
result = floorf(result);
}
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/RBSplitView/Source/RBSplitView.h
--- a/Frameworks/RBSplitView/Source/RBSplitView.h Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/RBSplitView/Source/RBSplitView.h Fri Aug 28 17:16:25 2009 -0400
@@ -27,7 +27,7 @@
NSColor* background; // The color used to paint the view's background (may be nil).
NSImage* divider; // The image used for the divider "dimple".
NSRect* dividers; // A C array of NSRects, one for each divider.
- float dividerThickness; // Actual divider width; should be an integer and at least 1.0.
+ CGFloat dividerThickness; // Actual divider width; should be an integer and at least 1.0.
BOOL mustAdjust; // Set internally if the subviews need to be adjusted.
BOOL mustClearFractions; // Set internally if fractions should be cleared before adjusting.
BOOL isHorizontal; // The divider's orientation; default is vertical.
@@ -86,7 +86,7 @@
- (id)initWithFrame:(NSRect)frame;
// This convenience initializer adds any number of subviews and adjusts them proportionally.
-- (id)initWithFrame:(NSRect)frame andSubviews:(unsigned)count;
+- (id)initWithFrame:(NSRect)frame andSubviews:(NSUInteger)count;
// Sets and gets the delegate. (Delegates aren't retained.) See further down for delegate methods.
- (void)setDelegate:(id)anObject;
@@ -96,17 +96,17 @@
- (RBSplitSubview*)subviewWithIdentifier:(NSString*)anIdentifier;
// Returns the subview at a certain position. Returns nil if the position is invalid.
-- (RBSplitSubview*)subviewAtPosition:(unsigned)position;
+- (RBSplitSubview*)subviewAtPosition:(NSUInteger)position;
// Adds a subview at a certain position.
-- (void)addSubview:(NSView*)aView atPosition:(unsigned)position;
+- (void)addSubview:(NSView*)aView atPosition:(NSUInteger)position;
// Sets and gets the divider thickness, which should be a positive integer or zero.
// Setting the divider image also resets this automatically, so you would call this
// only if you want the divider to be larger or smaller than the image. Zero means that
// the image dimensions will be used.
-- (void)setDividerThickness:(float)thickness;
-- (float)dividerThickness;
+- (void)setDividerThickness:(CGFloat)thickness;
+- (CGFloat)dividerThickness;
// Sets and gets the divider image. The default image can also be set in Interface Builder, so usually
// there's no need to call this. Passing in nil means that the default divider thickness will be zero,
@@ -192,16 +192,16 @@
// proposed rect is passed in. Return the actual rect, or NSZeroRect to suppress cursor setting
// for this divider. This won't be called for two-axis thumbs, however. The rects are in
// sender's local coordinates.
-- (NSRect)splitView:(RBSplitView*)sender cursorRect:(NSRect)rect forDivider:(unsigned int)divider;
+- (NSRect)splitView:(RBSplitView*)sender cursorRect:(NSRect)rect forDivider:(NSUInteger)divider;
// This method will be called whenever a mouse-down event is received in a divider. Return YES to have
// the event handled by the split view, NO if you wish to ignore it or handle it in the delegate.
-- (BOOL)splitView:(RBSplitView*)sender shouldHandleEvent:(NSEvent*)theEvent inDivider:(unsigned int)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing;
+- (BOOL)splitView:(RBSplitView*)sender shouldHandleEvent:(NSEvent*)theEvent inDivider:(NSUInteger)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing;
// This method will be called just before a subview will be collapsed or expanded with animation.
// Return the approximate time the animation should take, or 0.0 to disallow animation.
// If not implemented, it will use the default of 0.2 seconds per 150 pixels.
-- (NSTimeInterval)splitView:(RBSplitView*)sender willAnimateSubview:(RBSplitSubview*)subview withDimension:(float)dimension;
+- (NSTimeInterval)splitView:(RBSplitView*)sender willAnimateSubview:(RBSplitSubview*)subview withDimension:(CGFloat)dimension;
// This method will be called whenever a subview's frame is changed, usually from inside adjustSubviews' final loop.
// You'd normally use this to move some auxiliary view to keep it aligned with the subview.
@@ -211,11 +211,11 @@
// should act as an alternate drag view. Usually, the delegate will check the point (which is in sender's
// local coordinates) against the frame of one or several auxiliary views, and return a valid divider number.
// Returning NSNotFound means the point is not valid.
-- (unsigned int)splitView:(RBSplitView*)sender dividerForPoint:(NSPoint)point inSubview:(RBSplitSubview*)subview;
+- (NSUInteger)splitView:(RBSplitView*)sender dividerForPoint:(NSPoint)point inSubview:(RBSplitSubview*)subview;
// This method is called continuously while a divider is dragged, just before the leading subview is resized.
// Return NO to resize the trailing view by the same amount, YES to resize the containing window by the same amount.
-- (BOOL)splitView:(RBSplitView*)sender shouldResizeWindowForDivider:(unsigned int)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing willGrow:(BOOL)grow;
+- (BOOL)splitView:(RBSplitView*)sender shouldResizeWindowForDivider:(NSUInteger)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing willGrow:(BOOL)grow;
// This method is called by each subview's drawRect: method, just after filling it with the background color but
// before the contained subviews are drawn. Usually you would use this to draw a frame inside the subview.
diff -r 4229267e69e1 -r 1832ae51377b Frameworks/RBSplitView/Source/RBSplitView.m
--- a/Frameworks/RBSplitView/Source/RBSplitView.m Wed Aug 26 13:17:35 2009 -0400
+++ b/Frameworks/RBSplitView/Source/RBSplitView.m Fri Aug 28 17:16:25 2009 -0400
@@ -18,11 +18,11 @@
static NSCursor* cursors[RBSVCursorTypeCount] = {nil};
// Our own fMIN and fMAX
-static inline float fMIN(float a,float b) {
+static inline CGFloat fMIN(CGFloat a,CGFloat b) {
return a<b?a:b;
}
-static inline float fMAX(float a,float b) {
+static inline CGFloat fMAX(CGFloat a,CGFloat b) {
return a>b?a:b;
}
@@ -94,8 +94,8 @@
autosaveName = [aString retain];
if (flag) {
NSArray* subviews = [self subviews];
- int subcount = [subviews count];
- int i;
+ NSInteger subcount = [subviews count];
+ NSInteger i;
for (i=0;i<subcount;i++) {
RBSplitView* sv = [[subviews objectAtIndex:i] asSplitView];
if (sv) {
@@ -169,12 +169,12 @@
// You need to call adjustSubviews after calling this.
- (BOOL)setStatesFromArray:(NSArray*)array {
NSArray* subviews = [self subviews];
- unsigned int count = [array count];
+ NSUInteger count = [array count];
if (count==([subviews count]+1)) {
NSString* me = [array objectAtIndex:0];
if ([me isKindOfClass:[NSString class]]) {
if ([self setStateFromString:me]) {
- unsigned int i;
+ NSUInteger i;
for (i=1;i<count;i++) {
NSArray* item = [array objectAtIndex:i];
RBSplitView* suv = [[subviews objectAtIndex:i-1] asSplitView];
@@ -198,7 +198,7 @@
// be negative for collapsed subviews), all separated by blanks.
- (NSString*)stringWithSavedState {
NSArray* subviews = [self subviews];
- NSMutableString* result = [NSMutableString stringWithFormat:@"%d",[subviews count]];
+ NSMutableString* result = [NSMutableString stringWithFormat:@"%lu",(unsigned long)[subviews count]];
NSEnumerator* enumerator = [subviews objectEnumerator];
RBSplitSubview* sub;
while ((sub = [enumerator nextObject])) {
@@ -219,10 +219,10 @@
if ([aString length]) {
NSArray* parts = [aString componentsSeparatedByString:@" "];
NSArray* subviews = [self subviews];
- int subcount = [subviews count];
- int k = [parts count];
- if ((k-->1)&&([[parts objectAtIndex:0] intValue]==subcount)&&(k==subcount)) {
- int i;
+ NSInteger subcount = [subviews count];
+ NSInteger k = [parts count];
+ if ((k-->1)&&([[parts objectAtIndex:0] integerValue]==subcount)&&(k==subcount)) {
+ NSInteger i;
NSRect frame = [self frame];
BOOL ishor = [self isHorizontal];
for (i=0;i<subcount;i++) {
@@ -270,7 +270,7 @@
}
// This convenience initializer adds any number of subviews and adjusts them proportionally.
-- (id)initWithFrame:(NSRect)frame andSubviews:(unsigned)count {
+- (id)initWithFrame:(NSRect)frame andSubviews:(NSUInteger)count {
self = [self initWithFrame:frame];
More information about the commits
mailing list