mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-26 08:11:21 +00:00
Only test for modal window when it isn't nil.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25398 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
ddb8506a63
commit
85b36eece3
2 changed files with 23 additions and 17 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2007-08-19 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
|
* Source/NSButton.m ([performKeyEquivalent:]): Only test for modal
|
||||||
|
window when it isn't nil.
|
||||||
|
|
||||||
2007-08-16 Fred Kiefer <FredKiefer@gmx.de>
|
2007-08-16 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
* Headers/AppKit/NSFontManager.h,
|
* Headers/AppKit/NSFontManager.h,
|
||||||
|
|
|
@ -507,8 +507,9 @@ static id buttonCellClass = nil;
|
||||||
- (BOOL) performKeyEquivalent: (NSEvent *)anEvent
|
- (BOOL) performKeyEquivalent: (NSEvent *)anEvent
|
||||||
{
|
{
|
||||||
NSWindow *w = [self window];
|
NSWindow *w = [self window];
|
||||||
|
NSWindow *mw = [NSApp modalWindow];
|
||||||
|
|
||||||
if ([self isEnabled] && ([w worksWhenModal] || [NSApp modalWindow] == w))
|
if ([self isEnabled] && (mw == nil || [w worksWhenModal] || mw == w))
|
||||||
{
|
{
|
||||||
NSString *key = [self keyEquivalent];
|
NSString *key = [self keyEquivalent];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue