gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-26 07:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correction for toolbar customization palette not showing when standard elements are included.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27929 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2009-02-20 17:22:22 +00:00
parent e39e1d7488
commit 04ab4d4392
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2009-02-20 12:08-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Source/GSToolbarCustomizationPalette.m: Look up default items before
calling the delegate like in NSToolbar.m. This was causing an
exception which prevented the panel from showing.
2009-02-18 Richard Frith-Macdonald <rfm@gnu.org> 2009-02-18 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSServicesManager.m: Clean up update of services menu, * Source/GSServicesManager.m: Clean up update of services menu,

22
Source/GSToolbarCustomizationPalette.m
View file

@ -254,18 +254,28 @@
e = [itemIdentifiers objectEnumerator]; e = [itemIdentifiers objectEnumerator];
while ((identifier = [e nextObject]) != nil) while ((identifier = [e nextObject]) != nil)
{ {
[_allowedItems addObject: [delegate toolbar: toolbar NSToolbarItem *item = [toolbar _toolbarItemForIdentifier: identifier];
itemForItemIdentifier: identifier if(item == nil)
willBeInsertedIntoToolbar: NO]]; {
item = [delegate toolbar: toolbar
itemForItemIdentifier: identifier
willBeInsertedIntoToolbar: NO];
}
[_allowedItems addObject: item];
} }
itemIdentifiers = [delegate toolbarDefaultItemIdentifiers: toolbar]; itemIdentifiers = [delegate toolbarDefaultItemIdentifiers: toolbar];
e = [itemIdentifiers objectEnumerator]; e = [itemIdentifiers objectEnumerator];
while ((identifier = [e nextObject]) != nil) while ((identifier = [e nextObject]) != nil)
{ {
[_defaultItems addObject: [delegate toolbar: toolbar NSToolbarItem *item = [toolbar _toolbarItemForIdentifier: identifier];
itemForItemIdentifier: identifier if(item == nil)
willBeInsertedIntoToolbar: NO]]; {
item = [delegate toolbar: toolbar
itemForItemIdentifier: identifier
willBeInsertedIntoToolbar: NO];
}
[_defaultItems addObject: item];
} }
[_customizationView setToolbarItems: _allowedItems]; [_customizationView setToolbarItems: _allowedItems];