mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 22:30:48 +00:00
Removed unused default: label and tidied code
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10133 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico
parent
03d0329fac
commit
dd737ee9c9
1 changed files with 144 additions and 82 deletions
226
Source/NSCell.m
226
Source/NSCell.m
|
|
@ -382,73 +382,108 @@ static NSColor *shadowCol;
|
||||||
case NSCellHasOverlappingImage:
|
case NSCellHasOverlappingImage:
|
||||||
return _cell.image_position == NSImageOverlaps;
|
return _cell.image_position == NSImageOverlaps;
|
||||||
case NSCellHasImageHorizontal:
|
case NSCellHasImageHorizontal:
|
||||||
return (_cell.image_position == NSImageRight) ||
|
{
|
||||||
(_cell.image_position == NSImageLeft);
|
return (_cell.image_position == NSImageRight)
|
||||||
|
|| (_cell.image_position == NSImageLeft);
|
||||||
|
}
|
||||||
case NSCellHasImageOnLeftOrBottom:
|
case NSCellHasImageOnLeftOrBottom:
|
||||||
return (_cell.image_position == NSImageBelow) ||
|
{
|
||||||
(_cell.image_position == NSImageLeft);
|
return (_cell.image_position == NSImageBelow)
|
||||||
default:
|
|| (_cell.image_position == NSImageLeft);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) setCellAttribute: (NSCellAttribute)aParameter to: (int)value
|
- (void) setCellAttribute: (NSCellAttribute)aParameter to: (int)value
|
||||||
{
|
{
|
||||||
switch (aParameter)
|
switch (aParameter)
|
||||||
{
|
{
|
||||||
case NSCellDisabled:
|
case NSCellDisabled:
|
||||||
_cell.is_disabled = value;
|
{
|
||||||
break;
|
_cell.is_disabled = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSCellState:
|
case NSCellState:
|
||||||
_cell.state = value;
|
{
|
||||||
break;
|
_cell.state = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSCellEditable:
|
case NSCellEditable:
|
||||||
_cell.is_editable = value;
|
{
|
||||||
break;
|
_cell.is_editable = value;
|
||||||
case NSCellHighlighted:
|
break;
|
||||||
_cell.is_highlighted = value;
|
}
|
||||||
break;
|
case NSCellHighlighted:
|
||||||
|
{
|
||||||
|
_cell.is_highlighted = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSCellHasOverlappingImage:
|
case NSCellHasOverlappingImage:
|
||||||
if (value)
|
{
|
||||||
_cell.image_position = NSImageOverlaps;
|
if (value)
|
||||||
else
|
{
|
||||||
{
|
_cell.image_position = NSImageOverlaps;
|
||||||
if (_cell.image_position == NSImageOverlaps)
|
}
|
||||||
_cell.image_position = NSImageLeft;
|
else
|
||||||
}
|
{
|
||||||
break;
|
if (_cell.image_position == NSImageOverlaps)
|
||||||
|
{
|
||||||
|
_cell.image_position = NSImageLeft;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSCellHasImageHorizontal:
|
case NSCellHasImageHorizontal:
|
||||||
if (value)
|
{
|
||||||
{
|
if (value)
|
||||||
if (_cell.image_position != NSImageLeft
|
{
|
||||||
&& _cell.image_position != NSImageRight)
|
if (_cell.image_position != NSImageLeft
|
||||||
_cell.image_position = NSImageLeft;
|
&& _cell.image_position != NSImageRight)
|
||||||
}
|
{
|
||||||
else
|
_cell.image_position = NSImageLeft;
|
||||||
{
|
}
|
||||||
if (_cell.image_position == NSImageLeft)
|
}
|
||||||
_cell.image_position = NSImageAbove;
|
else
|
||||||
else if (_cell.image_position == NSImageRight)
|
{
|
||||||
_cell.image_position = NSImageBelow;
|
if (_cell.image_position == NSImageLeft)
|
||||||
}
|
{
|
||||||
break;
|
_cell.image_position = NSImageAbove;
|
||||||
|
}
|
||||||
|
else if (_cell.image_position == NSImageRight)
|
||||||
|
{
|
||||||
|
_cell.image_position = NSImageBelow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSCellHasImageOnLeftOrBottom:
|
case NSCellHasImageOnLeftOrBottom:
|
||||||
if (value)
|
{
|
||||||
{
|
if (value)
|
||||||
if (_cell.image_position == NSImageAbove)
|
{
|
||||||
_cell.image_position = NSImageBelow;
|
if (_cell.image_position == NSImageAbove)
|
||||||
else
|
{
|
||||||
_cell.image_position = NSImageLeft;
|
_cell.image_position = NSImageBelow;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (_cell.image_position == NSImageBelow)
|
_cell.image_position = NSImageLeft;
|
||||||
_cell.image_position = NSImageAbove;
|
}
|
||||||
else
|
}
|
||||||
_cell.image_position = NSImageRight;
|
else
|
||||||
}
|
{
|
||||||
break;
|
if (_cell.image_position == NSImageBelow)
|
||||||
|
{
|
||||||
|
_cell.image_position = NSImageAbove;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_cell.image_position = NSImageRight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
case NSCellChangesContents:
|
case NSCellChangesContents:
|
||||||
_cell. = value;
|
_cell. = value;
|
||||||
|
|
@ -458,12 +493,15 @@ static NSColor *shadowCol;
|
||||||
break;
|
break;
|
||||||
*/
|
*/
|
||||||
case NSCellIsBordered:
|
case NSCellIsBordered:
|
||||||
_cell.is_bordered = value;
|
{
|
||||||
break;
|
_cell.is_bordered = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSCellAllowsMixedState:
|
case NSCellAllowsMixedState:
|
||||||
_cell.allows_mixed_state = value;
|
{
|
||||||
break;
|
_cell.allows_mixed_state = value;
|
||||||
default:
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -473,21 +511,27 @@ static NSColor *shadowCol;
|
||||||
- (void) setType: (NSCellType)aType
|
- (void) setType: (NSCellType)aType
|
||||||
{
|
{
|
||||||
if (_cell.type == aType)
|
if (_cell.type == aType)
|
||||||
return;
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
_cell.type = aType;
|
_cell.type = aType;
|
||||||
switch (_cell.type)
|
switch (_cell.type)
|
||||||
{
|
{
|
||||||
case NSTextCellType:
|
case NSTextCellType:
|
||||||
ASSIGN (_contents, @"title");
|
{
|
||||||
_cell.contents_is_attributed_string = NO;
|
ASSIGN (_contents, @"title");
|
||||||
/* Doc says we have to reset the font too. */
|
_cell.contents_is_attributed_string = NO;
|
||||||
ASSIGN (_font, [fontClass userFontOfSize: 0]);
|
/* Doc says we have to reset the font too. */
|
||||||
break;
|
ASSIGN (_font, [fontClass userFontOfSize: 0]);
|
||||||
|
break;
|
||||||
|
}
|
||||||
case NSImageCellType:
|
case NSImageCellType:
|
||||||
TEST_RELEASE (_cell_image);
|
{
|
||||||
_cell_image = nil;
|
TEST_RELEASE (_cell_image);
|
||||||
break;
|
_cell_image = nil;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -531,14 +575,18 @@ static NSColor *shadowCol;
|
||||||
{
|
{
|
||||||
_cell.is_bezeled = flag;
|
_cell.is_bezeled = flag;
|
||||||
if (_cell.is_bezeled)
|
if (_cell.is_bezeled)
|
||||||
_cell.is_bordered = NO;
|
{
|
||||||
|
_cell.is_bordered = NO;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) setBordered: (BOOL)flag
|
- (void) setBordered: (BOOL)flag
|
||||||
{
|
{
|
||||||
_cell.is_bordered = flag;
|
_cell.is_bordered = flag;
|
||||||
if (_cell.is_bordered)
|
if (_cell.is_bordered)
|
||||||
_cell.is_bezeled = NO;
|
{
|
||||||
|
_cell.is_bezeled = NO;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -553,11 +601,17 @@ static NSColor *shadowCol;
|
||||||
* constants when calling this method, this way your code won't be
|
* constants when calling this method, this way your code won't be
|
||||||
* broken by changes. */
|
* broken by changes. */
|
||||||
if (value > 0 || (value < 0 && _cell.allows_mixed_state == NO))
|
if (value > 0 || (value < 0 && _cell.allows_mixed_state == NO))
|
||||||
_cell.state = NSOnState;
|
{
|
||||||
|
_cell.state = NSOnState;
|
||||||
|
}
|
||||||
else if (value == 0)
|
else if (value == 0)
|
||||||
_cell.state = NSOffState;
|
{
|
||||||
|
_cell.state = NSOffState;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
_cell.state = NSMixedState;
|
{
|
||||||
|
_cell.state = NSMixedState;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (int) state
|
- (int) state
|
||||||
|
|
@ -574,7 +628,9 @@ static NSColor *shadowCol;
|
||||||
{
|
{
|
||||||
_cell.allows_mixed_state = flag;
|
_cell.allows_mixed_state = flag;
|
||||||
if (!flag && _cell.state == NSMixedState)
|
if (!flag && _cell.state == NSMixedState)
|
||||||
[self setNextState];
|
{
|
||||||
|
[self setNextState];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (int) nextState
|
- (int) nextState
|
||||||
|
|
@ -582,19 +638,25 @@ static NSColor *shadowCol;
|
||||||
switch (_cell.state)
|
switch (_cell.state)
|
||||||
{
|
{
|
||||||
case NSOnState:
|
case NSOnState:
|
||||||
return NSOffState;
|
{
|
||||||
|
return NSOffState;
|
||||||
|
}
|
||||||
case NSOffState:
|
case NSOffState:
|
||||||
if (_cell.allows_mixed_state)
|
{
|
||||||
{
|
if (_cell.allows_mixed_state)
|
||||||
return NSMixedState;
|
{
|
||||||
}
|
return NSMixedState;
|
||||||
else
|
}
|
||||||
{
|
else
|
||||||
return NSOnState;
|
{
|
||||||
}
|
return NSOnState;
|
||||||
|
}
|
||||||
|
}
|
||||||
case NSMixedState:
|
case NSMixedState:
|
||||||
default:
|
default:
|
||||||
return NSOnState;
|
{
|
||||||
|
return NSOnState;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue