Correction for resource manager.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21085 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2005-04-11 05:09:40 +00:00
parent 1465667ceb
commit 5a0150c3bb
3 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,9 @@
2005-04-11 01:04 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m
* GormCore/GormObjectEditor.m: Corrected problem with resource
manager.
2005-04-10 23:59 Gregory John Casamento <greg_casamento@yahoo.com> 2005-04-10 23:59 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m: Moved call to register IBResourceManager * GormCore/GormDocument.m: Moved call to register IBResourceManager

View file

@ -1297,6 +1297,7 @@ static NSImage *fileImage = nil;
{ {
NSDebugLog(@"WARNING anEditor = editor"); NSDebugLog(@"WARNING anEditor = editor");
} }
[editor activate]; [editor activate];
RELEASE((NSObject *)editor); RELEASE((NSObject *)editor);

View file

@ -114,9 +114,8 @@ static NSMapTable *docMap = 0;
- (BOOL) acceptsTypeFromArray: (NSArray*)types - (BOOL) acceptsTypeFromArray: (NSArray*)types
{ {
if ([types containsObject: IBObjectPboardType] == YES) NSArray *resourceTypes = [resourceManager resourcePasteboardTypes];
return YES; return ([resourceTypes firstObjectCommonWithArray: types] != nil);
return NO;
} }
- (void) pasteInSelection - (void) pasteInSelection
@ -497,7 +496,7 @@ static NSMapTable *docMap = 0;
/* /*
* Tell the source that we will accept the drop if we can. * Tell the source that we will accept the drop if we can.
*/ */
if (dragType == IBObjectPboardType) if ([[resourceManager resourcePasteboardTypes] containsObject: dragType])
{ {
/* /*
* We can accept objects dropped anywhere. * We can accept objects dropped anywhere.