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

Corrected handling of pasteboard data of type NSFilenamesPboardType.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17015 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2003-06-24 22:57:12 +00:00
parent 0ede427d8b
commit fe2421f135
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-06-25 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSImage.m (initWithPasteboard:):
* Source/NSView.m (dragFile:fromRect:slideBack:event:):
Corrected handling of pasteboard data of type NSFilenamesPboardType.
2003-06-24 01:05 Alexander Malmberg <alexander@malmberg.org> 2003-06-24 01:05 Alexander Malmberg <alexander@malmberg.org>
* Source/NSTabViewItem.m (-drawLabel:inRect:): Update for change * Source/NSTabViewItem.m (-drawLabel:inRect:): Update for change

7
Source/NSImage.m
View file

@ -400,9 +400,12 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
[self addRepresentations: reps]; [self addRepresentations: reps];
else else
{ {
NSString* file = [pasteboard propertyListForType: NSFilenamesPboardType]; NSArray *array = [pasteboard propertyListForType: NSFilenamesPboardType];
NSString* file;
if (file != nil || ![self _loadFromFile: file]) if ((array == nil) || ([array count] == 0) ||
(file = [array objectAtIndex: 0]) == nil ||
![self _loadFromFile: file])
{ {
RELEASE(self); RELEASE(self);
return nil; return nil;

2
Source/NSView.m
View file

@ -2920,7 +2920,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
[pboard declareTypes: [NSArray arrayWithObject: NSFilenamesPboardType] [pboard declareTypes: [NSArray arrayWithObject: NSFilenamesPboardType]
owner: self]; owner: self];
if (![pboard setPropertyList: filename if (![pboard setPropertyList: [NSArray arrayWithObject: filename]
forType: NSFilenamesPboardType]) forType: NSFilenamesPboardType])
return NO; return NO;