Small changes to prepare for merge of NSToolbar and GSToolbar.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27488 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2009-01-01 19:22:50 +00:00
parent 68bac76652
commit 7ce954508f
6 changed files with 36 additions and 78 deletions

View file

@ -93,14 +93,10 @@ static const int current_version = 1;
// Instance methods
- (id) initWithIdentifier: (NSString *)identifier
displayMode: (NSToolbarDisplayMode)displayMode
sizeMode: (NSToolbarSizeMode)sizeMode
{
NSToolbar *toolbarModel = nil;
if ((self = [super initWithIdentifier: identifier
displayMode: displayMode
sizeMode: sizeMode]) == nil)
if ((self = [super initWithIdentifier: identifier]) == nil)
{
return nil;
}
@ -109,14 +105,10 @@ static const int current_version = 1;
if (toolbarModel != nil)
{
_displayMode = [toolbarModel displayMode];
_sizeMode = [toolbarModel sizeMode];
_visible = [toolbarModel isVisible];
}
else
{
_displayMode = displayMode;
_sizeMode = sizeMode;
_visible = YES;
}