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

Handle case when makeFirstResonder: fails.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25456 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-09-05 13:04:49 +00:00
parent 9a371e74bd
commit 136c7c950c
2 changed files with 69 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Source/NSWindow.m
View file

@ -2803,7 +2803,9 @@ resetCursorRectsForView(NSView *theView)
return NO;
if (![aResponder acceptsFirstResponder])
return NO;
{
return NO;
}
}
/* So that the implementation of -resignFirstResponder in
@ -2816,12 +2818,14 @@ resetCursorRectsForView(NSView *theView)
* Change only if it replies YES.
*/
if ((_firstResponder) && (![_firstResponder resignFirstResponder]))
return NO;
{
return NO;
}
_firstResponder = aResponder;
if ((aResponder == nil) || ![_firstResponder becomeFirstResponder])
{
_firstResponder = self;
_firstResponder = self;
[_firstResponder becomeFirstResponder];
return (aResponder == nil);
}
@ -3274,14 +3278,18 @@ resetCursorRectsForView(NSView *theView)
{
v = [_wv hitTest: [theEvent locationInWindow]];
}
if (_firstResponder != v)
{
[self makeFirstResponder: v];
}
if (_lastView)
{
DESTROY(_lastView);
}
if (_firstResponder != v)
{
// Only try to set first responder, when the view wants it.
if ([v acceptsFirstResponder] && ![self makeFirstResponder: v])
{
return;
}
}
if (wasKey == YES || [v acceptsFirstMouse: theEvent] == YES)
{
if ([NSHelpManager isContextHelpModeActive])
@ -3843,12 +3851,15 @@ resetCursorRectsForView(NSView *theView)
theView = [aView nextValidKeyView];
if (theView)
{
[self makeFirstResponder: theView];
if (![self makeFirstResponder: theView])
{
return;
}
if ([theView respondsToSelector:@selector(selectText:)])
{
_selectionDirection = NSSelectingNext;
[(id)theView selectText: self];
_selectionDirection = NSDirectSelection;
{
_selectionDirection = NSSelectingNext;
[(id)theView selectText: self];
_selectionDirection = NSDirectSelection;
}
}
}
@ -3864,13 +3875,16 @@ resetCursorRectsForView(NSView *theView)
theView = [aView previousValidKeyView];
if (theView)
{
[self makeFirstResponder: theView];
if (![self makeFirstResponder: theView])
{
return;
}
if ([theView respondsToSelector:@selector(selectText:)])
{
_selectionDirection = NSSelectingPrevious;
[(id)theView selectText: self];
_selectionDirection = NSDirectSelection;
}
{
_selectionDirection = NSSelectingPrevious;
[(id)theView selectText: self];
_selectionDirection = NSDirectSelection;
}
}
}
@ -3900,7 +3914,10 @@ resetCursorRectsForView(NSView *theView)
if (theView)
{
[self makeFirstResponder: theView];
if (![self makeFirstResponder: theView])
{
return;
}
if ([theView respondsToSelector:@selector(selectText:)])
{
_selectionDirection = NSSelectingNext;
@ -3936,8 +3953,11 @@ resetCursorRectsForView(NSView *theView)
if (theView)
{
[self makeFirstResponder: theView];
if ([theView respondsToSelector:@selector(selectText:)])
if (![self makeFirstResponder: theView])
{
return;
}
if ([theView respondsToSelector:@selector(selectText:)])
{
_selectionDirection = NSSelectingPrevious;
[(id)theView selectText: self];