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

Fix handling of NSMenuItem:s.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13827 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2002-06-10 23:48:09 +00:00
parent 7fc2bc2f2a
commit d0e9dae770
3 changed files with 38 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-06-11 Alexander Malmberg <alexander@malmberg.org>
* Source/GSServicesManager.m,
Headers/gnustep/gui/GSServicesManager.h: Fix handling of
NSMenuItem:s (were being handled as NSCell:s in many places; this
broke submenus of the services menu).
2002-06-10 Georg Fleischmann <georg@vhf.de>
* Source/NSControl.m ([NSControl -mouseDown:]): Set NSPeriodicMask

7
Headers/gnustep/gui/GSServicesManager.h
View file

@ -29,7 +29,6 @@
@class NSApplication;
@class NSArray;
@class NSCell;
@class NSDate;
@class NSMenu;
@class NSMutableArray;
@ -57,9 +56,9 @@
}
+ (GSServicesManager*) newWithApplication: (NSApplication*)app;
+ (GSServicesManager*) manager;
- (void) doService: (NSCell*)item;
- (void) doService: (NSMenuItem*)item;
- (BOOL) hasRegisteredTypes: (NSDictionary*)service;
- (NSString*) item2title: (NSCell*)item;
- (NSString*) item2title: (NSMenuItem*)item;
- (void) loadServices;
- (NSDictionary*) menuServices;
- (void) rebuildServices;
@ -73,7 +72,7 @@
- (void) setServicesProvider: (id)anObject;
- (int) setShowsServicesMenuItem: (NSString*)item to: (BOOL)enable;
- (BOOL) showsServicesMenuItem: (NSString*)item;
- (BOOL) validateMenuItem: (NSCell*)item;
- (BOOL) validateMenuItem: (NSMenuItem*)item;
- (void) updateServicesMenu;
@end

52
Source/GSServicesManager.m
View file

@ -53,7 +53,6 @@
#include <AppKit/NSMenu.h>
#include <AppKit/NSPanel.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSCell.h>
#include <AppKit/NSWorkspace.h>
#include <AppKit/GSServicesManager.h>
@ -451,7 +450,7 @@ static NSString *disabledName = @".GNUstepDisabled";
[super dealloc];
}
- (void) doService: (NSCell*)item
- (void) doService: (NSMenuItem*)item
{
NSString *title = [self item2title: item];
NSDictionary *info = [_title2info objectForKey: title];
@ -566,11 +565,11 @@ static NSString *disabledName = @".GNUstepDisabled";
}
/*
* Use tag in menu cell to identify slot in menu titles array that
* Use tag in menu item to identify slot in menu titles array that
* contains the full title of the service.
* Return nil if this is not one of our service menu cells.
* Return nil if this is not one of our service menu items.
*/
- (NSString*) item2title: (NSCell*)item
- (NSString*) item2title: (NSMenuItem*)item
{
unsigned pos;
@ -830,7 +829,7 @@ static NSString *disabledName = @".GNUstepDisabled";
}
else
{
menu = (NSMenu*)[item target];
menu = (NSMenu*)[item submenu];
}
if (menu != submenu)
{
@ -1027,7 +1026,7 @@ static NSString *disabledName = @".GNUstepDisabled";
return NO;
}
- (BOOL) validateMenuItem: (NSCell*)item
- (BOOL) validateMenuItem: (NSMenuItem*)item
{
NSString *title = [self item2title: item];
NSDictionary *info = [_title2info objectForKey: title];
@ -1039,12 +1038,17 @@ static NSString *disabledName = @".GNUstepDisabled";
NSWindow *resp = [[_application keyWindow] firstResponder];
/*
* If the menu item is not in our map, it must be the cell containing
* a sub-menu - so we see if any cell in the submenu is valid.
* If the menu item is not in our map, it must be the item containing
* a sub-menu - so we see if any item in the submenu is valid.
*/
if (title == nil)
{
NSMenu *sub = [item target];
NSMenu *sub;
if (![item isKindOfClass: [NSMenuItem class]])
return NO;
sub = [item submenu];
if (sub && [sub isKindOfClass: [NSMenu class]])
{
@ -1062,7 +1066,7 @@ static NSString *disabledName = @".GNUstepDisabled";
}
/*
* The cell corresponds to one of our services - so we check to see if
* The item corresponds to one of our services - so we check to see if
* there is anything that can deal with it.
*/
if (es == 0)
@ -1140,46 +1144,46 @@ static NSString *disabledName = @".GNUstepDisabled";
for (i = 0; i < [a count]; i++)
{
NSCell *cell = [a objectAtIndex: i];
BOOL wasEnabled = [cell isEnabled];
NSMenuItem *item = [a objectAtIndex: i];
BOOL wasEnabled = [item isEnabled];
BOOL shouldBeEnabled;
NSString *title = [self item2title: cell];
NSString *title = [self item2title: item];
/*
* If there is no title mapping, this cell must be a
* submenu - so we check the submenu cells.
* If there is no title mapping, this item must be a
* submenu - so we check the submenu items.
*/
if (title == nil && [[cell target] isKindOfClass: [NSMenu class]])
if (title == nil && [[item submenu] isKindOfClass: [NSMenu class]])
{
NSArray *sub = [[cell target] itemArray];
NSArray *sub = [[item submenu] itemArray];
int j;
shouldBeEnabled = NO;
for (j = 0; j < [sub count]; j++)
{
NSCell *subCell = [sub objectAtIndex: j];
BOOL subWasEnabled = [subCell isEnabled];
NSMenuItem *subitem = [sub objectAtIndex: j];
BOOL subWasEnabled = [subitem isEnabled];
BOOL subShouldBeEnabled = NO;
if ([self validateMenuItem: subCell] == YES)
if ([self validateMenuItem: subitem] == YES)
{
shouldBeEnabled = YES; /* Enabled menu */
subShouldBeEnabled = YES;
}
if (subWasEnabled != subShouldBeEnabled)
{
[subCell setEnabled: subShouldBeEnabled];
[subitem setEnabled: subShouldBeEnabled];
// [subMenuCells setNeedsDisplayInRect:
// [subMenuCells cellFrameAtRow: j]];
}
}
}
else
shouldBeEnabled = [self validateMenuItem: cell];
shouldBeEnabled = [self validateMenuItem: item];
if (wasEnabled != shouldBeEnabled)
{
[cell setEnabled: shouldBeEnabled];
[item setEnabled: shouldBeEnabled];
// [menuCells setNeedsDisplayInRect: [menuCells cellFrameAtRow: i]];
}
}