diff --git a/ChangeLog b/ChangeLog index 7e6ee9024..667afb05a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-04-13 Michael Hanni + + * Source/NSProgressIndicator.m: revert last change. + * Source/NSInterfaceStyle.m: revert last change. + * Headers/NSInterfaceStyle.h: revert last change. + 2003-04-13 Michael Hanni Multiple outstanding commits. diff --git a/Headers/gnustep/gui/NSInterfaceStyle.h b/Headers/gnustep/gui/NSInterfaceStyle.h index 7948cf4ea..e41a5fe7a 100644 --- a/Headers/gnustep/gui/NSInterfaceStyle.h +++ b/Headers/gnustep/gui/NSInterfaceStyle.h @@ -44,8 +44,8 @@ typedef enum { * GNUstep specific. Blame: Michael Hanni. */ - GSWindowMakerInterfaceStyle = 4, - GSGtkInterfaceStyle = 5 + GSWindowMakerInterfaceStyle = 4 + } NSInterfaceStyle; APPKIT_EXPORT NSString *NSInterfaceStyleDefault; diff --git a/Source/NSInterfaceStyle.m b/Source/NSInterfaceStyle.m index f0290a06b..8a7ea079a 100644 --- a/Source/NSInterfaceStyle.m +++ b/Source/NSInterfaceStyle.m @@ -48,8 +48,6 @@ styleFromString(NSString* str) return NSMacintoshInterfaceStyle; if ([str isEqualToString: @"NSWindows95InterfaceStyle"]) return NSWindows95InterfaceStyle; - if ([str isEqualToString: @"GSGtkInterfaceStyle"]) - return GSGtkInterfaceStyle; if ([str isEqualToString: @"GSWindowMakerInterfaceStyle"]) return GSWindowMakerInterfaceStyle; return NSNoInterfaceStyle; diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m index 1a0af078d..83489ca22 100644 --- a/Source/NSProgressIndicator.m +++ b/Source/NSProgressIndicator.m @@ -258,31 +258,8 @@ NSImage *images[maxCount]; r = NSIntersectionRect(r,rect); if (!NSIsEmptyRect(r)) { - if (NSInterfaceStyleForKey(@"NSProgressIndicatorInterfaceStyle", nil) - == GSGtkInterfaceStyle) - { - NSRectEdge sides[] = {NSMaxXEdge, NSMinYEdge, - NSMinXEdge, NSMaxYEdge, - NSMaxXEdge, NSMinYEdge}; - float grays[] = {NSBlack, NSBlack, - NSLightGray, NSLightGray, - NSDarkGray, NSDarkGray}; - NSRect rect; - - rect = NSDrawTiledRects(r, r, - sides, grays, 6); - - /* This should perhaps be something else to ease in - * color themeing. - */ - [[NSColor scrollBarColor] set]; - NSRectFill(rect); - } - else /* default case */ - { - [fillColour set]; - NSRectFill(r); - } + [fillColour set]; + NSRectFill(r); } } }