gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 18:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Corrected initialization problem. Was doing [NSButton init...

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17579 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-08-31 13:28:03 +00:00
parent 7f15b1ab39
commit 09b96f1cbb
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,6 +1,11 @@
2003-08-31 Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSToolbarItem.m: Corrected code to instantiate
button for toolbar items.
2003-08-30 Gregory John Casamento <greg_casamento@yahoo.com> 2003-08-30 Gregory John Casamento <greg_casamento@yahoo.com>
* GSNibTemplates.m: [GSNibContainer awakeWithContext:] * Source/GSNibTemplates.m: [GSNibContainer awakeWithContext:]
was not releasing the connections in the array after calling was not releasing the connections in the array after calling
establishConnection. Once this is done, the connections establishConnection. Once this is done, the connections
are no longer needed. are no longer needed.
@ -16,7 +21,7 @@
2003-08-30 Gregory John Casamento <greg_casamento@yahoo.com> 2003-08-30 Gregory John Casamento <greg_casamento@yahoo.com>
* GSNibTemplates.m: Added code to templates to conditionally * Source/GSNibTemplates.m: Added code to templates to conditionally
call the designated initializer if and only if it is defined call the designated initializer if and only if it is defined
on the class which is being unarchived, not the parent classes. on the class which is being unarchived, not the parent classes.
This is consistent with behaviour under OpenStep. This is consistent with behaviour under OpenStep.
@ -39,7 +44,7 @@
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 * Source/GSNibTemplates.m: Removed an extra release which was causing
a segfault. Added code to prevent calling the designated initializer a segfault. Added code to prevent calling the designated initializer
when isInterfaceBuilder is defined. when isInterfaceBuilder is defined.

14
Source/NSToolbarItem.m
View file

@ -268,7 +268,7 @@
- (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)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -286,7 +286,7 @@
- (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)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -304,7 +304,7 @@
- (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)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -322,7 +322,7 @@
- (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)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -340,7 +340,7 @@
- (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)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -358,7 +358,7 @@
- (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)]; NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
[super initWithItemIdentifier: itemIdentifier]; [super initWithItemIdentifier: itemIdentifier];
[self setView: button]; [self setView: button];
[self setImage: image]; [self setImage: image];
@ -376,7 +376,9 @@
- (id) initWithItemIdentifier: (NSString *)itemIdentifier - (id) initWithItemIdentifier: (NSString *)itemIdentifier
{ {
NSImage *image = [NSImage imageNamed: @"GSToolbarPrintItem"]; NSImage *image = [NSImage imageNamed: @"GSToolbarPrintItem"];
NSButton *button = [[NSButton alloc] 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;
} }