colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-21 09:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for updating target/action of toolbar items.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I
2010-01-13 20:03:01 -08:00
parent 211a7c7939
commit e25a227e4d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPToolbar.j
+8 -1
View File
@@ -896,7 +896,7 @@ var TOP_MARGIN = 5.0,
_toolbar = aToolbar;
var keyPaths = [@"label", @"image", @"alternateImage", @"minSize", @"maxSize", @"enabled"],
var keyPaths = [@"label", @"image", @"alternateImage", @"minSize", @"maxSize", @"target", @"action", @"enabled"],
index = 0,
count = [keyPaths count];
@@ -1102,6 +1102,13 @@ var TOP_MARGIN = 5.0,
{
if (aKeyPath === "enabled")
[self setEnabled:[anObject isEnabled]];
else if (aKeyPath === @"target")
[self setTarget:[anObject target]];
else if (aKeyPath === @"action")
[self setAction:[anObject action]];
else
[self updateFromItem];
}
AppKit/CPToolbarItem.j
+1 -1
View File
@@ -548,7 +548,7 @@ var CPToolbarItemItemIdentifierKey = @"CPToolbarItemItemIdentifierKey",
[self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
[self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
[self setAction:[aCoder decodeObjectForKey:CPToolbarItemActionKey]];
[self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
[self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
Tools/nib2cib/NSToolbarItem.j
-1
View File
@@ -57,7 +57,6 @@ NS_CPToolbarItemIdentifierMap =
[self setTag:[aCoder decodeObjectForKey:@"NSToolbarItemTag"]];
[self setTarget:[aCoder decodeObjectForKey:@"NSToolbarItemTarget"]];
[self setAction:CPSelectorFromString([aCoder decodeObjectForKey:@"NSToolbarItemAction"])];
[self setEnabled:[aCoder decodeBoolForKey:@"NSToolbarItemEnabled"]];
[self setImage:[aCoder decodeBoolForKey:@"NSToolbarItemImage"]];