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

* Source/NSMenu.m (-performActionForItemAtIndex:): Check for the

Browse source 
popup button cell and its action, before checking for the item
action. This caused a problem due to NIB decoding changes.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34642 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-01-26 22:38:50 +00:00
parent af8b7fd367
commit a5612f4bcb
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-01-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSMenu.m (-performActionForItemAtIndex:): Check for the
popup button cell and its action, before checking for the item
action. This caused a problem due to NIB decoding changes.
2012-01-26 Fred Kiefer <FredKiefer@gmx.de> 2012-01-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextView.m (-updateRuler): Replace last change with one * Source/NSTextView.m (-updateRuler): Replace last change with one

15
Source/NSMenu.m
View file

@ -1310,18 +1310,17 @@ static BOOL menuBarVisible = YES;
[_popUpButtonCell selectItemAtIndex: index]; [_popUpButtonCell selectItemAtIndex: index];
} }
if ((action = [item action]) != NULL) if (_popUpButtonCell != nil && (action = [_popUpButtonCell action]) != NULL)
{ {
[NSApp sendAction: action [NSApp sendAction: action
to: [item target] to: [_popUpButtonCell target]
from: item]; from: [_popUpButtonCell controlView]];
} }
else if (_popUpButtonCell != nil) else if ((action = [item action]) != NULL)
{ {
if ((action = [_popUpButtonCell action]) != NULL) [NSApp sendAction: action
[NSApp sendAction: action to: [item target]
to: [_popUpButtonCell target] from: item];
from: [_popUpButtonCell controlView]];
} }
[nc postNotificationName: NSMenuDidSendActionNotification [nc postNotificationName: NSMenuDidSendActionNotification