gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-23 19:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GormCore/GormInspectorsManager.m: Fix for bug#25111.

Browse source 
* Plugins/Nib/GormNibWrapperBuilder.m: Remove code which adds nil
	to the map if the object is a GormFirstResponder


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@27327 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2008-12-18 05:16:40 +00:00
parent b5c94828fb
commit b656a67d81
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-12-18 00:20-EST Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormInspectorsManager.m: Fix for bug#25111.
* Plugins/Nib/GormNibWrapperBuilder.m: Remove code which adds nil
to the map if the object is a GormFirstResponder
2008-12-06 11:04-EST Bernard Cafarelli <voyageur>
Gregory John Casamento <greg_casamento@yahoo.com>

4
GormCore/GormInspectorsManager.m
View file

@ -388,7 +388,7 @@
oldView = [inspectorView contentView];
newView = [[inspector window] contentView];
if (newView != nil)
if (newView != nil && newView != oldView)
{
id initialResponder = [[inspector window] initialFirstResponder];
NSView *outer = [panel contentView];
@ -455,7 +455,7 @@
RETAIN(oldView);
[inspectorView setContentView: newView];
[[prevInspector window] setContentView: oldView];
RELEASE(oldView);
// RELEASE(oldView);
/* Set the default First responder to the new View */
if ( initialResponder )

26
Plugins/Nib/GormNibWrapperBuilder.m
View file

@ -165,6 +165,21 @@
wantsToBeColor: wantsToBeColor
autoPositionMask: autoPositionMask];
}
else if([object isKindOfClass: [NSText class]])
{
template = [[NSTextTemplate alloc] initWithObject: object
className: customClass];
}
else if([object isKindOfClass: [NSTextView class]])
{
template = [[NSTextViewTemplate alloc] initWithObject: object
className: customClass];
}
else if([object isKindOfClass: [NSView class]])
{
template = [[NSViewTemplate alloc] initWithObject: object
className: customClass];
}
else
{
template = [[NSClassSwapper alloc] initWithObject: object
@ -270,11 +285,12 @@
id replacementObject = NSMapGet(_objectMap,object);
id o = object;
if([o isKindOfClass: [GormFirstResponder class]])
{
o = nil;
}
else if(replacementObject != nil)
// if([o isKindOfClass: [GormFirstResponder class]])
// {
// o = nil;
// }
// else
if(replacementObject != nil)
{
o = replacementObject;
}