gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 04:50:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove special handling for proxies in NSColor.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28805 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-10-12 13:52:28 +00:00
parent 73197a77aa
commit 300db987b2
2 changed files with 24 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-10-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSColor.m: Remove special proxy handling introduced in
last change.
2009-10-11 Richard Frith-Macdonald <rfm@gnu.org> 2009-10-11 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSTheme.m: Implement -description for proxies. * Source/GSTheme.m: Implement -description for proxies.

62
Source/NSColor.m
View file

@ -1899,11 +1899,9 @@ static NSRecursiveLock *namedColorLock = nil;
return NO; return NO;
else else
{ {
GSNamedColor *col = (GSNamedColor*)other; if (![[other catalogNameComponent] isEqualToString: _catalog_name])
if (![[col catalogNameComponent] isEqualToString: _catalog_name])
return NO; return NO;
if (![[col colorNameComponent] isEqualToString: _color_name]) if (![[other colorNameComponent] isEqualToString: _color_name])
return NO; return NO;
return YES; return YES;
} }
@ -2046,10 +2044,8 @@ static NSRecursiveLock *namedColorLock = nil;
return NO; return NO;
else else
{ {
GSWhiteColor *col = (GSWhiteColor*)other; if ([other whiteComponent] != _white_component
|| [other alphaComponent] != _alpha_component)
if ([col whiteComponent] != _white_component
|| [col alphaComponent] != _alpha_component)
{ {
return NO; return NO;
} }
@ -2359,30 +2355,14 @@ static NSRecursiveLock *namedColorLock = nil;
return NO; return NO;
else else
{ {
GSDeviceCMYKColor *col = (GSDeviceCMYKColor*)other; if ([other cyanComponent] != _cyan_component
|| [other magentaComponent] != _magenta_component
if ([other isProxy]) || [other yellowComponent] != _yellow_component
{ || [other blackComponent] != _black_component
if ([col cyanComponent] != _cyan_component || [other alphaComponent] != _alpha_component)
|| [col magentaComponent] != _magenta_component
|| [col yellowComponent] != _yellow_component
|| [col blackComponent] != _black_component
|| [col alphaComponent] != _alpha_component)
{ {
return NO; return NO;
} }
}
else
{
if (col->_cyan_component != _cyan_component
|| col->_magenta_component != _magenta_component
|| col->_yellow_component != _yellow_component
|| col->_black_component != _black_component
|| col->_alpha_component != _alpha_component)
{
return NO;
}
}
return YES; return YES;
} }
return NO; return NO;
@ -2619,26 +2599,12 @@ static NSRecursiveLock *namedColorLock = nil;
return NO; return NO;
else else
{ {
GSRGBColor *col = (GSRGBColor*)other; if ([other redComponent] != _red_component
|| [other greenComponent] != _green_component
if ([other isProxy]) || [other blueComponent] != _blue_component)
{
if ([col redComponent] != _red_component
|| [col greenComponent] != _green_component
|| [col blueComponent] != _blue_component)
{ {
return NO; return NO;
} }
}
else
{
if (col->_red_component != _red_component
|| col->_green_component != _green_component
|| col->_blue_component != _blue_component)
{
return NO;
}
}
return YES; return YES;
} }
@ -3143,9 +3109,7 @@ static NSRecursiveLock *namedColorLock = nil;
return NO; return NO;
else else
{ {
GSPatternColor *col = (GSPatternColor*)other; if ([[other patternImage] isEqual: _pattern] == NO)
if ([[col patternImage] isEqual: _pattern] == NO)
return NO; return NO;
return YES; return YES;
} }