diff --git a/ChangeLog b/ChangeLog index bc1c34cf6..fff1998c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-02-23 Fred Kiefer + + * Header/AppKit/NSColor.h (-alternateSelectedControlColor, + -alternateSelectedControlTextColor, + -secondarySelectedControlColor, + controlAlternatingRowBackgroundColors): New MacOSX system colour methods. + * Source/NSColor.m (-alternateSelectedControlColor, + -alternateSelectedControlTextColor, + -secondarySelectedControlColor, + controlAlternatingRowBackgroundColors): Implemented the new + methods. + (initSystemColors): Added default values for new system coloure methods + 2005-02-21 Fred Kiefer * Source/NSCell.m (-initWithCoder): diff --git a/Headers/AppKit/NSColor.h b/Headers/AppKit/NSColor.h index 2e66dc3fc..c6bed7bce 100644 --- a/Headers/AppKit/NSColor.h +++ b/Headers/AppKit/NSColor.h @@ -191,6 +191,8 @@ typedef enum _NSControlTint { // // System colors stuff. // ++ (NSColor*) alternateSelectedControlColor; ++ (NSColor*) alternateSelectedControlTextColor; + (NSColor*) controlBackgroundColor; + (NSColor*) controlColor; + (NSColor*) controlHighlightColor; @@ -206,6 +208,7 @@ typedef enum _NSControlTint { + (NSColor*) keyboardFocusIndicatorColor; + (NSColor*) knobColor; + (NSColor*) scrollBarColor; ++ (NSColor*) secondarySelectedControlColor; + (NSColor*) selectedControlColor; + (NSColor*) selectedControlTextColor; + (NSColor*) selectedKnobColor; @@ -220,6 +223,8 @@ typedef enum _NSControlTint { + (NSColor*) windowFrameColor; + (NSColor*) windowFrameTextColor; ++ (NSArray*) controlAlternatingRowBackgroundColors; + // Pattern colour - (NSImage*) patternImage; #endif diff --git a/Source/NSColor.m b/Source/NSColor.m index 4b889c315..30f9b77d8 100644 --- a/Source/NSColor.m +++ b/Source/NSColor.m @@ -186,7 +186,7 @@ void initSystemColors(void) colorStrings = [[NSMutableDictionary alloc] initWithObjectsAndKeys: - lightGray, @"controlBackgroundColor", + lightGray, @"controlBackgroundColor", lightGray, @"controlColor", lightGray, @"controlHighlightColor", white, @"controlLightHighlightColor", @@ -214,6 +214,11 @@ void initSystemColors(void) lightGray, @"windowBackgroundColor", black, @"windowFrameColor", white, @"windowFrameTextColor", + black, @"alternateSelectedControlColor", + white, @"alternateSelectedControlTextColor", + white, @"rowBackgroundColor", + lightGray, @"alternateRowBackgroundColor", + lightGray, @"secondarySelectedControlColor", //gray, @"windowFrameColor", //black, @"windowFrameTextColor", nil]; @@ -573,6 +578,16 @@ systemColorWithName(NSString *name) // // System colors stuff. // ++ (NSColor*) alternateSelectedControlColor +{ + return systemColorWithName(@"alternateSelectedControlColor"); +} + ++ (NSColor*) alternateSelectedControlTextColor +{ + return systemColorWithName(@"alternateSelectedControlTextColor"); +} + + (NSColor*) controlBackgroundColor { return systemColorWithName(@"controlBackgroundColor"); @@ -648,6 +663,11 @@ systemColorWithName(NSString *name) return systemColorWithName(@"scrollBarColor"); } ++ (NSColor*) secondarySelectedControlColor +{ + return systemColorWithName(@"secondarySelectedControlColor"); +} + + (NSColor*) selectedControlColor { return systemColorWithName(@"selectedControlColor"); @@ -713,6 +733,12 @@ systemColorWithName(NSString *name) return systemColorWithName(@"windowFrameTextColor"); } ++ (NSArray*) controlAlternatingRowBackgroundColors +{ + return [NSArray arrayWithObjects: systemColorWithName(@"rowBackgroundColor"), + systemColorWithName(@"alternateRowBackgroundColor"), nil]; +} + //////////////////////////////////////////////////////////// // // Instance methods