* Source/NSWindowController.m: Fixed a problem where controller marks

the window as loaded even when the nib failed to load.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30227 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Jonathan Gillaspie 2010-04-23 19:26:44 +00:00
parent e03690b917
commit 0ebc6d3185
2 changed files with 17 additions and 11 deletions

View file

@ -1,9 +1,13 @@
2010-04-23 Jonathan Gillaspie <jonathan.gillaspie@testplant.com>
* Source/NSWindowController.m: Fixed a problem where controller marks
the window as loaded even when the nib failed to load.
2010-04-23 Jonathan Gillaspie <jonathan.gillaspie@testplant.com>
* Headers/AppKit/NSGraphics.h: NSBeep() - Don't crash when a
graphics context isn't available (eg - from a subthread).
2010-04-23 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSAlert.m (NSRunAlertPanel): Fix incorrect return code
@ -85,9 +89,9 @@
2010-04-13 Jonathan Gillaspie <jonathan.gillaspie@testplant.com>
* Source/GSToolTips.m: Use a single retain window for tooltips instead of a
newly created one each time. This significantly reduces callback interaction
with MS-Windows callbacks.
* Source/GSToolTips.m: Use a single retained window for tooltips instead of
a newly created one each time. This significantly reduces interaction
with MS-Windows callbacks.
2010-04-12 Fred Kiefer <FredKiefer@gmx.de>

View file

@ -302,13 +302,15 @@
}
[self loadWindow];
[self _windowDidLoad];
if ([_document respondsToSelector:
@selector(windowControllerDidLoadNib:)])
{
[_document windowControllerDidLoadNib:self];
}
if ([self isWindowLoaded])
{
[self _windowDidLoad];
if ([_document respondsToSelector:
@selector(windowControllerDidLoadNib:)])
{
[_document windowControllerDidLoadNib:self];
}
}
}
return _window;