gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 15:31:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated variable names. Added more implementation.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17566 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2003-08-29 04:13:48 +00:00
parent b865d283b8
commit d803a3ac7e
3 changed files with 67 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2003-08-29 Gregory John Casamento <greg_casamento@yahoo.com>
* NSToolbarItem.[hm]: Implemented copyWithZone: for NSCopying,
removed an unused flag and shortened the flag names which were
somewhat long. Did some general cleanup. Implemented standard
items.
2003-08-28 Gregory John Casamento <greg_casamento@yahoo.com> 2003-08-28 Gregory John Casamento <greg_casamento@yahoo.com>
* GSNibTemplates.m: Removed an extra release which was causing * GSNibTemplates.m: Removed an extra release which was causing

27
Headers/AppKit/NSToolbarItem.h
View file

@ -75,23 +75,22 @@ APPKIT_EXPORT NSString *NSToolbarPrintItemIdentifier;
// record the fact that the view responds to these // record the fact that the view responds to these
// to save time. // to save time.
struct __tbflags struct __flags
{ {
// gets // gets
unsigned int viewRespondsToIsEnabled:1; unsigned int _isEnabled:1;
unsigned int viewRespondsToTag:1; unsigned int _tag:1;
unsigned int viewRespondsToAction:1; unsigned int _action:1;
unsigned int viewRespondsToTarget:1; unsigned int _target:1;
unsigned int viewRespondsToImage:1; unsigned int _image:1;
// sets // sets
unsigned int viewRespondsToSetEnabled:1; unsigned int _setEnabled:1;
unsigned int viewRespondsToSetTag:1; unsigned int _setTag:1;
unsigned int viewRespondsToSetAction:1; unsigned int _setAction:1;
unsigned int viewRespondsToSetTarget:1; unsigned int _setTarget:1;
unsigned int viewRespondsToSetImage:1; unsigned int _setImage:1;
// other flags // to even out the long.
unsigned int isUserRemovable:1; unsigned int RESERVED:22;
unsigned int RESERVED:21; // to even out the long.
} _flags; } _flags;
} }

67
Source/NSToolbarItem.m
View file

@ -33,6 +33,7 @@
#include "AppKit/NSToolbar.h" #include "AppKit/NSToolbar.h"
#include "AppKit/NSMenuItem.h" #include "AppKit/NSMenuItem.h"
#include "AppKit/NSImage.h" #include "AppKit/NSImage.h"
#include "AppKit/NSButton.h"
@implementation NSToolbarItem @implementation NSToolbarItem
- (BOOL)allowsDuplicatesInToolbar - (BOOL)allowsDuplicatesInToolbar
@ -42,7 +43,7 @@
- (NSImage *)image - (NSImage *)image
{ {
if(_flags.viewRespondsToImage) if(_flags._image)
{ {
return [_view image]; return [_view image];
} }
@ -57,7 +58,7 @@
- (BOOL)isEnabled - (BOOL)isEnabled
{ {
if(_flags.viewRespondsToIsEnabled) if(_flags._isEnabled)
{ {
return [_view isEnabled]; return [_view isEnabled];
} }
@ -96,7 +97,7 @@
- (void)setAction: (SEL)action - (void)setAction: (SEL)action
{ {
if(_flags.viewRespondsToSetAction) if(_flags._setAction)
{ {
[_view setAction: action]; [_view setAction: action];
} }
@ -104,7 +105,7 @@
- (void)setEnabled: (BOOL)enabled - (void)setEnabled: (BOOL)enabled
{ {
if(_flags.viewRespondsToSetEnabled) if(_flags._setEnabled)
{ {
[_view setEnabled: enabled]; [_view setEnabled: enabled];
} }
@ -112,7 +113,7 @@
- (void)setImage: (NSImage *)image - (void)setImage: (NSImage *)image
{ {
if(_flags.viewRespondsToSetImage) if(_flags._setImage)
{ {
[_view setImage: image]; [_view setImage: image];
} }
@ -145,7 +146,7 @@
- (void)setTag: (int)tag - (void)setTag: (int)tag
{ {
if(_flags.viewRespondsToTag) if(_flags._tag)
{ {
[_view setTag: tag]; [_view setTag: tag];
} }
@ -153,7 +154,7 @@
- (void)setTarget: (id)target - (void)setTarget: (id)target
{ {
if(_flags.viewRespondsToTarget) if(_flags._target)
{ {
[_view setTarget: target]; [_view setTarget: target];
} }
@ -168,22 +169,22 @@
{ {
ASSIGN(_view, view); ASSIGN(_view, view);
// gets // gets
_flags.viewRespondsToIsEnabled = [_view respondsToSelector: @selector(isEnabled)]; _flags._isEnabled = [_view respondsToSelector: @selector(isEnabled)];
_flags.viewRespondsToTag = [_view respondsToSelector: @selector(tag)]; _flags._tag = [_view respondsToSelector: @selector(tag)];
_flags.viewRespondsToAction = [_view respondsToSelector: @selector(action)]; _flags._action = [_view respondsToSelector: @selector(action)];
_flags.viewRespondsToTarget = [_view respondsToSelector: @selector(target)]; _flags._target = [_view respondsToSelector: @selector(target)];
_flags.viewRespondsToImage = [_view respondsToSelector: @selector(image)]; _flags._image = [_view respondsToSelector: @selector(image)];
// sets // sets
_flags.viewRespondsToSetEnabled = [_view respondsToSelector: @selector(setEnabled:)]; _flags._setEnabled = [_view respondsToSelector: @selector(setEnabled:)];
_flags.viewRespondsToSetTag = [_view respondsToSelector: @selector(setTag:)]; _flags._setTag = [_view respondsToSelector: @selector(setTag:)];
_flags.viewRespondsToSetAction = [_view respondsToSelector: @selector(setAction:)]; _flags._setAction = [_view respondsToSelector: @selector(setAction:)];
_flags.viewRespondsToSetTarget = [_view respondsToSelector: @selector(setTarget:)]; _flags._setTarget = [_view respondsToSelector: @selector(setTarget:)];
_flags.viewRespondsToSetImage = [_view respondsToSelector: @selector(setImage:)]; _flags._setImage = [_view respondsToSelector: @selector(setImage:)];
} }
- (int)tag - (int)tag
{ {
if(_flags.viewRespondsToTag) if(_flags._tag)
{ {
return [_view tag]; return [_view tag];
} }
@ -214,7 +215,7 @@
// NSValidatedUserInterfaceItem protocol // NSValidatedUserInterfaceItem protocol
- (SEL)action - (SEL)action
{ {
if(_flags.viewRespondsToAction) if(_flags._action)
{ {
return [_view action]; return [_view action];
} }
@ -223,7 +224,7 @@
- (id)target - (id)target
{ {
if(_flags.viewRespondsToTarget) if(_flags._target)
{ {
return [_view target]; return [_view target];
} }
@ -233,6 +234,20 @@
// NSCopying protocol // NSCopying protocol
- (id)copyWithZone: (NSZone *)zone - (id)copyWithZone: (NSZone *)zone
{ {
NSToolbarItem *new = [[NSToolbarItem allocWithZone: zone] initWithItemIdentifier: _itemIdentifier];
// copy all items individually...
[new setTarget: [self target]];
[new setAction: [self action]];
[new setView: [self view]];
[new setToolTip: [[self toolTip] copyWithZone: zone]];
[new setTag: [self tag]];
[new setImage: [[self image] copyWithZone: zone]];
[new setEnabled: [self isEnabled]];
[new setPaletteLabel: [[self paletteLabel] copyWithZone: zone]];
[new setMinSize: NSMakeSize(_minSize.width, _minSize.height)];
[new setMaxSize: NSMakeSize(_maxSize.width, _maxSize.height)];
return self; return self;
} }
@end @end
@ -253,7 +268,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarSeperatorItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarSeperatorItem"];
NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button];
[self setImage: image]; [self setImage: image];
return self; return self;
} }
@ -269,7 +286,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarSpaceItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarSpaceItem"];
NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button];
[self setImage: image]; [self setImage: image];
return self; return self;
} }
@ -285,7 +304,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarFlexibleSpaceItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarFlexibleSpaceItem"];
NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button];
[self setImage: image]; [self setImage: image];
return self; return self;
} }
@ -301,7 +322,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarShowColorsItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarShowColorsItem"];
NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button];
[self setImage: image]; [self setImage: image];
return self; return self;
} }
@ -317,7 +340,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarShowFontsItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarShowFontsItem"];
NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button];
[self setImage: image]; [self setImage: image];
return self; return self;
} }
@ -333,7 +358,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarCustomizeToolbarItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarCustomizeToolbarItem"];
NSButton *button = [NSButton initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button];
[self setImage: image]; [self setImage: image];
return self; return self;
} }