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

Merge from 0.6.5

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6040 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2000-02-19 00:40:47 +00:00
parent 1b97488859
commit b33bb418f4
42 changed files with 2343 additions and 1170 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Source/NSWindow.m
View file

@ -344,9 +344,12 @@ static NSMapTable* windowmaps = NULL;
[content_view removeFromSuperview];
}
content_view = aView;
[content_view setFrame: [_wv frame]]; // Resize to fill window.
[content_view setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[_wv addSubview: content_view]; // Add to our window view
[content_view setAutoresizingMask: (NSViewWidthSizable
| NSViewHeightSizable)];
[_wv addSubview: content_view];
[content_view resizeWithOldSuperviewSize: [content_view frame].size];
[content_view setFrameOrigin: [_wv bounds].origin];
NSAssert1 ([[_wv subviews] count] == 1,
@"window's view has %d subviews!", [[_wv subviews] count]);
@ -679,18 +682,25 @@ static NSMapTable* windowmaps = NULL;
if ([self isKeyWindow])
{
[self resignKeyWindow];
for (i = pos + 1; i != pos; i++)
i = pos + 1;
if (i == c)
{
i = 0;
}
while (i != pos)
{
if (i == c)
{
i = 0;
}
w = [windowList objectAtIndex: i];
if ([w isVisible] && [w canBecomeKeyWindow])
{
[w makeKeyWindow];
break;
}
i++;
if (i == c)
{
i = 0;
}
}
/*
* if we didn't find a possible key window - use the app icon or,
@ -720,18 +730,25 @@ static NSMapTable* windowmaps = NULL;
}
else
{
for (i = pos + 1; i != pos; i++)
i = pos + 1;
if (i == c)
{
i = 0;
}
while (i != pos)
{
if (i == c)
{
i = 0;
}
w = [windowList objectAtIndex: i];
if ([w isVisible] && [w canBecomeMainWindow])
{
[w makeMainWindow];
break;
}
i++;
if (i == c)
{
i = 0;
}
}
}
}