diff --git a/Headers/gnustep/gui/NSBitmapImageRep.h b/Headers/gnustep/gui/NSBitmapImageRep.h index 46933f1b9..61132e896 100644 --- a/Headers/gnustep/gui/NSBitmapImageRep.h +++ b/Headers/gnustep/gui/NSBitmapImageRep.h @@ -47,20 +47,22 @@ typedef enum _NSTIFFCompression { NSTIFFCompressionOldJPEG = 32865 } NSTIFFCompression; -@interface NSBitmapImageRep : NSImageRep +@interface NSBitmapImageRep : NSImageRep { // Attributes - unsigned int bytesPerRow; - unsigned int numColors; - unsigned int bitsPerPixel; - unsigned short compression; - float comp_factor; + unsigned int _bytesPerRow; + unsigned int _numColors; + unsigned int _bitsPerPixel; + unsigned short _compression; + float _comp_factor; BOOL _isPlanar; - unsigned char **imagePlanes; - NSMutableData *imageData; + unsigned char **_imagePlanes; + NSMutableData *_imageData; // Reserved for back-end use - void *back_end_reserved; + // FIXME: This is used only for the method xPixmapMask in the shared X code. + // If we change the dragging code, we can remove this method and the ivar! + void *_back_end_reserved; } // @@ -120,12 +122,6 @@ typedef enum _NSTIFFCompression { - (void) setCompression: (NSTIFFCompression)compression factor: (float)factor; -// -// NSCoding protocol -// -- (void) encodeWithCoder: (NSCoder*)aCoder; -- (id) initWithCoder: (NSCoder*)aDecoder; - @end #endif // _GNUstep_H_NSBitmapImageRep diff --git a/Headers/gnustep/gui/NSCachedImageRep.h b/Headers/gnustep/gui/NSCachedImageRep.h index 8fcb35091..3cd69d7ca 100644 --- a/Headers/gnustep/gui/NSCachedImageRep.h +++ b/Headers/gnustep/gui/NSCachedImageRep.h @@ -34,12 +34,11 @@ @class NSWindow; -@interface NSCachedImageRep : NSImageRep +@interface NSCachedImageRep : NSImageRep { // Attributes NSRect _rect; NSWindow* _window; - void* _cache; } // @@ -58,12 +57,6 @@ - (NSRect)rect; - (NSWindow *)window; -// -// NSCoding protocol -// -- (void)encodeWithCoder:aCoder; -- initWithCoder:aDecoder; - @end #endif // _GNUstep_H_NSCachedImageRep diff --git a/Headers/gnustep/gui/NSCustomImageRep.h b/Headers/gnustep/gui/NSCustomImageRep.h index ff116fb73..e04f0f03b 100644 --- a/Headers/gnustep/gui/NSCustomImageRep.h +++ b/Headers/gnustep/gui/NSCustomImageRep.h @@ -31,11 +31,11 @@ #include -@interface NSCustomImageRep : NSImageRep +@interface NSCustomImageRep : NSImageRep { // Attributes - id delegate; - SEL selector; + id _delegate; + SEL _selector; } - (id)initWithDrawSelector:(SEL)aSelector @@ -47,12 +47,6 @@ - (id)delegate; - (SEL)drawSelector; -// -// NSCoding protocol -// -- (void)encodeWithCoder:aCoder; -- initWithCoder:aDecoder; - @end #endif // _GNUstep_H_NSCustomImageRep diff --git a/Headers/gnustep/gui/NSImageRep.h b/Headers/gnustep/gui/NSImageRep.h index a98bbf6ed..bf8dc5ffb 100644 --- a/Headers/gnustep/gui/NSImageRep.h +++ b/Headers/gnustep/gui/NSImageRep.h @@ -46,10 +46,10 @@ enum { { // Attributes NSString* _colorSpace; - NSSize size; - BOOL hasAlpha; - BOOL isOpaque; - int bitsPerSample; + NSSize _size; + BOOL _hasAlpha; + BOOL _isOpaque; + int _bitsPerSample; int _pixelsWide; int _pixelsHigh; } @@ -61,6 +61,8 @@ enum { + (NSArray *)imageRepsWithContentsOfFile:(NSString *)filename; + (id)imageRepWithPasteboard:(NSPasteboard *)pasteboard; + (NSArray *)imageRepsWithPasteboard:(NSPasteboard *)pasteboard; ++ (id)imageRepWithContentsOfURL:(NSURL *)anURL; ++ (NSArray *)imageRepsWithContentsOfURL:(NSURL *)anURL; // // Checking Data Types @@ -111,12 +113,6 @@ enum { + (NSArray *)registeredImageRepClasses; + (void)unregisterImageRepClass:(Class)imageRepClass; -// -// NSCoding protocol -// -- (void)encodeWithCoder:aCoder; -- initWithCoder:aDecoder; - @end extern NSString *NSImageRepRegistryChangedNotification;