Author: mlytwyn
Date: Fri Jun 26 18:52:58 2015
New Revision: 38701
URL: http://svn.gna.org/viewcvs/gnustep?rev=38701&view=rev
Log:
GSToolbarView merge
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m?rev=38701&r1=38700&r2=38701&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m Fri Jun
26 18:52:58 2015
@@ -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 <[email protected]>
Date: January 2004
@@ -72,6 +72,8 @@
* 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 @@
- (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;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
