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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2009-02-04 01:53-EST Gregory John Casamento <greg_casamento@yahoo.com>
* 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.
2009-02-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSCell.m (-_sendActionFrom:): New helper method for

2
Source/GSNibLoader.m
View file

@ -137,7 +137,7 @@
// report a problem if there is one.
if (loaded == NO)
{
NSLog(@"Could not load Gorm file: %@",fileName);
NSLog(@"Could not load Nib file: %@",fileName);
}
}

2
Source/GSNibLoading.m
View file

@ -1786,7 +1786,7 @@ static BOOL _isInInterfaceBuilder = NO;
// free other objects.
RELEASE(_accessibilityConnectors);
// RELEASE(_connections);
RELEASE(_connections);
RELEASE(_fontManager);
RELEASE(_framework);
RELEASE(_visibleWindows);

11
Source/NSApplication.m
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

5
Source/NSLayoutManager.m
View file

@ -2292,11 +2292,12 @@ no_soft_invalidation:
if ([aDecoder allowsKeyedCoding])
{
/*
int i;
id delegate = [aDecoder decodeObjectForKey: @"NSDelegate"];
int flags;
NSArray *array = [aDecoder decodeObjectForKey: @"NSTextContainers"];
NSTextStorage *storage = [aDecoder decodeObjectForKey: @"NSTextStorage"];
id delegate = [aDecoder decodeObjectForKey: @"NSDelegate"];
if ([aDecoder containsValueForKey: @"NSLMFlags"])
{
@ -2311,7 +2312,7 @@ no_soft_invalidation:
{
[self addTextContainer: [array objectAtIndex: i]];
}
*/
return self;
}
else