Added the color panel enumerators and corrected them. Adopted the

ivars to the new implementation.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8975 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2001-02-05 01:24:16 +00:00
parent f5c728f2fc
commit 77d11b1cf6

View file

@ -43,7 +43,28 @@
@class NSColorList;
@class NSEvent;
@interface NSColorPanel : NSPanel <NSCoding>
enum {
NSGrayModeColorPanel,
NSRGBModeColorPanel,
NSCMYKModeColorPanel,
NSHSBModeColorPanel,
NSCustomPaletteModeColorPanel,
NSColorListModeColorPanel,
NSWheelModeColorPanel
};
enum {
NSColorPanelGrayModeMask = 1,
NSColorPanelRGBModeMask = 2,
NSColorPanelCMYKModeMask = 4,
NSColorPanelHSBModeMask = 8,
NSColorPanelCustomPaletteModeMask = 16,
NSColorPanelColorListModeMask = 32,
NSColorPanelWheelModeMask = 64,
NSColorPanelAllModesMask = 127
};
@interface NSColorPanel : NSPanel
{
// Attributes
NSView *_topView;
@ -52,17 +73,17 @@
NSMatrix *_pickerMatrix;
NSBox *_pickerBox;
NSSlider *_alphaSlider;
NSBox *_accessoryBox;
NSSplitView *_splitView;
NSView *_accessoryView;
NSMatrix *_swatches;
//NSMatrix *_swatches;
NSMutableArray *_pickers;
id<NSColorPickingCustom> _currentPicker;
id<NSColorPickingCustom,NSColorPickingDefault> _currentPicker;
id _target;
SEL _action;
BOOL _isContinuous;
BOOL _showsAlpha;
}
//
@ -99,15 +120,10 @@
+ (BOOL)dragColor:(NSColor *)aColor
withEvent:(NSEvent *)anEvent
fromView:(NSView *)sourceView;
- (float)alpha;
- (NSColor *)color;
- (void)setColor:(NSColor *)aColor;
//
// NSCoding protocol
//
- (void)encodeWithCoder:aCoder;
- initWithCoder:aDecoder;
- (float)alpha;
- (NSColor *)color;
@end