mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-26 07:50:58 +00:00
Tidied
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8815 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
514c59d055
commit
aa57ff1a1d
2 changed files with 18 additions and 13 deletions
|
@ -242,7 +242,9 @@
|
||||||
NSRect f;
|
NSRect f;
|
||||||
|
|
||||||
if ([_content_view respondsToSelector: @selector(sizeToFit)])
|
if ([_content_view respondsToSelector: @selector(sizeToFit)])
|
||||||
[_content_view sizeToFit];
|
{
|
||||||
|
[_content_view sizeToFit];
|
||||||
|
}
|
||||||
else // _content_view !respondsToSelector: sizeToFit
|
else // _content_view !respondsToSelector: sizeToFit
|
||||||
{
|
{
|
||||||
NSArray *subviewArray = [_content_view subviews];
|
NSArray *subviewArray = [_content_view subviews];
|
||||||
|
@ -642,9 +644,13 @@
|
||||||
if (!aFlag)
|
if (!aFlag)
|
||||||
{
|
{
|
||||||
if (r.size.width < 0)
|
if (r.size.width < 0)
|
||||||
r.size.width = 0;
|
{
|
||||||
|
r.size.width = 0;
|
||||||
|
}
|
||||||
if (r.size.height < 0)
|
if (r.size.height < 0)
|
||||||
r.size.height = 0;
|
{
|
||||||
|
r.size.height = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
|
|
|
@ -172,29 +172,29 @@ id _nsbuttonCellClass = nil;
|
||||||
return [_cell title];
|
return [_cell title];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSAttributedString *)attributedAlternateTitle
|
- (NSAttributedString *) attributedAlternateTitle
|
||||||
{
|
{
|
||||||
return [_cell attributedAlternateTitle];
|
return [_cell attributedAlternateTitle];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSAttributedString *)attributedTitle
|
- (NSAttributedString *) attributedTitle
|
||||||
{
|
{
|
||||||
return [_cell attributedTitle];
|
return [_cell attributedTitle];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setAttributedAlternateTitle:(NSAttributedString *)aString
|
- (void) setAttributedAlternateTitle: (NSAttributedString *)aString
|
||||||
{
|
{
|
||||||
[_cell setAttributedAlternateTitle: aString];
|
[_cell setAttributedAlternateTitle: aString];
|
||||||
[self setNeedsDisplay: YES];
|
[self setNeedsDisplay: YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setAttributedTitle:(NSAttributedString *)aString
|
- (void) setAttributedTitle: (NSAttributedString *)aString
|
||||||
{
|
{
|
||||||
[_cell setAttributedTitle: aString];
|
[_cell setAttributedTitle: aString];
|
||||||
[self setNeedsDisplay: YES];
|
[self setNeedsDisplay: YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setTitleWithMnemonic:(NSString *)aString
|
- (void) setTitleWithMnemonic: (NSString *)aString
|
||||||
{
|
{
|
||||||
[_cell setTitleWithMnemonic: aString];
|
[_cell setTitleWithMnemonic: aString];
|
||||||
[self setNeedsDisplay: YES];
|
[self setNeedsDisplay: YES];
|
||||||
|
@ -378,12 +378,12 @@ id _nsbuttonCellClass = nil;
|
||||||
return NO;
|
return NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setSound:(NSSound *)aSound
|
- (void) setSound: (NSSound *)aSound
|
||||||
{
|
{
|
||||||
[_cell setSound: aSound];
|
[_cell setSound: aSound];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSSound *)sound
|
- (NSSound *) sound
|
||||||
{
|
{
|
||||||
return [_cell sound];
|
return [_cell sound];
|
||||||
}
|
}
|
||||||
|
@ -391,16 +391,15 @@ id _nsbuttonCellClass = nil;
|
||||||
//
|
//
|
||||||
// NSCoding protocol
|
// NSCoding protocol
|
||||||
//
|
//
|
||||||
- (void) encodeWithCoder: (NSCoder*)aCoder
|
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||||
{
|
{
|
||||||
[super encodeWithCoder: aCoder];
|
[super encodeWithCoder: aCoder];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id) initWithCoder: (NSCoder*)aDecoder
|
- (id) initWithCoder: (NSCoder *)aDecoder
|
||||||
{
|
{
|
||||||
[super initWithCoder: aDecoder];
|
[super initWithCoder: aDecoder];
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
Loading…
Reference in a new issue