mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 20:01:11 +00:00
Add comment for removing merge on bug# 6150 fix
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38816 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
31ffdc9fd5
commit
78b58c0f24
1 changed files with 16 additions and 13 deletions
|
@ -88,6 +88,7 @@
|
|||
{
|
||||
// Reset the _selected attribute to prevent crash when -dealloc calls
|
||||
// -setNextKeyView:
|
||||
// Testplant-MAL-2015-07-20: Keep Frank LeGrand's fix...
|
||||
_original_nextKeyView = nil;
|
||||
_selected = nil;
|
||||
RELEASE(_items);
|
||||
|
@ -263,22 +264,24 @@
|
|||
selectedView = [_selected view];
|
||||
if (selectedView != nil)
|
||||
{
|
||||
NSView *firstResponder;
|
||||
|
||||
NSView *firstResponder;
|
||||
|
||||
[self addSubview: selectedView];
|
||||
// FIXME: We should not change this mask
|
||||
// FIXME: We should not change this mask
|
||||
[selectedView setAutoresizingMask:
|
||||
NSViewWidthSizable | NSViewHeightSizable];
|
||||
NSViewWidthSizable | NSViewHeightSizable];
|
||||
[selectedView setFrame: [self contentRect]];
|
||||
firstResponder = [_selected initialFirstResponder];
|
||||
if (firstResponder == nil)
|
||||
{
|
||||
firstResponder = [_selected view];
|
||||
[_selected setInitialFirstResponder: firstResponder];
|
||||
[firstResponder _setUpKeyViewLoopWithNextKeyView:
|
||||
_original_nextKeyView];
|
||||
}
|
||||
[super setNextKeyView: firstResponder];
|
||||
firstResponder = [_selected initialFirstResponder];
|
||||
if (firstResponder == nil)
|
||||
{
|
||||
firstResponder = [_selected view];
|
||||
[_selected setInitialFirstResponder: firstResponder];
|
||||
[firstResponder _setUpKeyViewLoopWithNextKeyView:
|
||||
_original_nextKeyView];
|
||||
}
|
||||
|
||||
// Testplant-MAL-2015-07-20: Keep Frank LeGrand's fix...
|
||||
[super setNextKeyView: firstResponder];
|
||||
[_window makeFirstResponder: firstResponder];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue