* Source/GSNibLoader.m: Correct the message to indicate an issue

loading a nib, not a gorm, file.
	* Source/GSNibLoading.m: Uncomment the release in the dealloc
	method.
	* Source/NSApplication.m: Restrict the icon size to the size of the
	miniwindow if it's larger, but don't expand it, if it's smaller.
	* Source/NSLayoutManager.m: -initWithCoder: Initialize when 
	loading a nib in the same way that we initialize when loading 
	a gorm file.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27775 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2009-02-04 06:48:06 +00:00
parent 900209df53
commit d0d81bf1b1
5 changed files with 27 additions and 5 deletions

View file

@ -2133,12 +2133,21 @@ image.</p><p>See Also: -applicationIconImage</p>
NSEnumerator *iterator = [[self windows] objectEnumerator];
NSWindow *current;
NSImage *old_app_icon = _app_icon;
NSSize miniWindowSize = [_app_icon_window frame].size;
NSSize imageSize = [anImage size];
RETAIN(old_app_icon);
[_app_icon setName: nil];
[anImage setName: @"NSApplicationIcon"];
[anImage setScalesWhenResized: YES];
[anImage setSize: NSMakeSize(48,48)];
// restrict size when the icon is larger than the mini window.
if(imageSize.width > miniWindowSize.width ||
imageSize.height > miniWindowSize.height)
{
[anImage setSize: miniWindowSize];
}
ASSIGN(_app_icon, anImage);
[_main_menu _organizeMenu]; // Let horizontal menu change icon