Prefixed all ivars with underscores, made fileName an ivar of NSImage and

added some missing methods.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8418 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2000-12-23 14:16:51 +00:00
parent 6b0432bf62
commit 84398c7cae

View file

@ -37,16 +37,18 @@
@class NSString; @class NSString;
@class NSMutableArray; @class NSMutableArray;
@class NSData; @class NSData;
@class NSURL;
@class NSPasteboard; @class NSPasteboard;
@class NSImageRep; @class NSImageRep;
@class NSColor; @class NSColor;
@class NSView; @class NSView;
@interface NSImage : NSObject <NSCoding> @interface NSImage : NSObject <NSCoding, NSCopying>
{ {
// Attributes // Attributes
NSString *name; NSString *_name;
NSString *_fileName;
NSSize _size; NSSize _size;
struct __imageFlags { struct __imageFlags {
unsigned archiveByName: 1; unsigned archiveByName: 1;
@ -64,7 +66,7 @@
NSMutableArray *_reps; NSMutableArray *_reps;
NSColor *_color; NSColor *_color;
NSView *_lockedView; NSView *_lockedView;
id delegate; id _delegate;
} }
// //
@ -76,6 +78,12 @@
- (id) initWithPasteboard: (NSPasteboard*)pasteboard; - (id) initWithPasteboard: (NSPasteboard*)pasteboard;
- (id) initWithSize: (NSSize)aSize; - (id) initWithSize: (NSSize)aSize;
#ifndef STRICT_OPENSTEP
- (id)initWithBitmapHandle:(void *)bitmap;
- (id)initWithContentsOfURL:(NSURL *)anURL;
- (id)initWithIconHandle:(void *)icon;
#endif
// //
// Setting the Size of the Image // Setting the Size of the Image
// //
@ -179,18 +187,6 @@
+ (NSArray*) imageFileTypes; + (NSArray*) imageFileTypes;
+ (NSArray*) imagePasteboardTypes; + (NSArray*) imagePasteboardTypes;
//
// Methods Implemented by the Delegate
//
- (NSImage*) imageDidNotDraw: (id)sender
inRect: (NSRect)aRect;
//
// NSCoding protocol
//
- (void) encodeWithCoder: (NSCoder*)aCoder;
- (id) initWithCoder: (NSCoder*)aDecoder;
@end @end
@ -200,4 +196,16 @@
@end @end
#ifndef NO_GNUSTEP
/*
* A formal protocol that duplicates the informal protocol for delegates.
*/
@protocol GSImageDelegateProtocol
- (NSImage*) imageDidNotDraw: (id)sender
inRect: (NSRect)aRect;
@end
#endif
#endif // _GNUstep_H_NSImage #endif // _GNUstep_H_NSImage