GSToolbarView merge

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38701 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-26 16:52:58 +00:00
parent 0b03717fe9
commit a836b68b6a

View file

@ -3,7 +3,7 @@
<abstract>The toolbar view class.</abstract>
Copyright (C) 2004 Free Software Foundation, Inc.
Copyright (C) 2004-2015 Free Software Foundation, Inc.
Author: Quentin Mathe <qmathe@club-internet.fr>
Date: January 2004
@ -72,6 +72,8 @@ static NSInteger draggedItemIndex = NSNotFound;
* Toolbar related code
*/
// Testplant-MAL-2015-06-26: Main branch merge...
// Keeping this testplant fix for GSToolBarButton...
@interface GSToolbarButton : NSButton
- (NSToolbarItem *) toolbarItem;
@end
@ -891,7 +893,7 @@ static NSInteger draggedItemIndex = NSNotFound;
- (NSMenu *) menuForEvent: (NSEvent *)event
{
NSMenu *menu = [[[NSMenu alloc] initWithTitle: @""] autorelease];
NSMenuItem *customize = [menu insertItemWithTitle: _(@"Customize Toolbar") action:@selector(runCustomizationPalette:) keyEquivalent:@"" atIndex:0];
id <NSMenuItem> customize = [menu insertItemWithTitle: _(@"Customize Toolbar") action:@selector(runCustomizationPalette:) keyEquivalent:@"" atIndex:0];
[customize setTarget: _toolbar];
return menu;
}