Correction for bug#19792

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@25850 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2008-01-04 01:03:54 +00:00
parent 29b9223701
commit ae4cd37e77
2 changed files with 28 additions and 12 deletions

View file

@ -1,3 +1,8 @@
2008-01-03 20:02-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormNibWrapperLoader.m: Corrections for bug#19792.
Nib loader connector logic modified to correct this issue.
2008-01-03 19:40-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormViewKnobs.m: drkgrey changed to fgcolor.

View file

@ -259,19 +259,12 @@
{
id dest = [o destination];
id src = [o source];
NSLog(@"Connector: %@",o);
if([o isKindOfClass: [NSNibControlConnector class]])
{
NSString *tag = [o label];
if(dest == nibFilesOwner)
{
[o setDestination: [document filesOwner]];
}
else if(dest == nil)
{
[o setDestination: [document firstResponder]];
}
// Correct the missing colon problem...
NSRange colonRange = [tag rangeOfString: @":"];
unsigned int location = colonRange.location;
@ -282,19 +275,37 @@
}
}
if(dest == nibFilesOwner)
{
[o setDestination: [document filesOwner]];
}
else if(dest == nil)
{
[o setDestination: [document firstResponder]];
}
if(src == nibFilesOwner)
{
[o setSource: [document filesOwner]];
}
else if(src == nil)
{
[o setSource: [document firstResponder]];
}
// check src/dest for window template...
if([src isKindOfClass: [NSWindowTemplate class]])
{
id win = [src realObject];
[o setSource: win];
}
else if([dest isKindOfClass: [NSWindowTemplate class]])
if([dest isKindOfClass: [NSWindowTemplate class]])
{
id win = [dest realObject];
[o setDestination: win];
}
// skip any help connectors...
if([o isKindOfClass: [NSIBHelpConnector class]])
{