Index: NSBrowserCell.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/NSBrowserCell.m,v
retrieving revision 1.43
diff -u -r1.43 NSBrowserCell.m
--- NSBrowserCell.m	13 Jun 2003 15:01:11 -0000	1.43
+++ NSBrowserCell.m	26 Jul 2003 06:54:03 -0000
@@ -260,7 +260,6 @@
       image_rect.origin.x += cellFrame.size.width - image_rect.size.width - 4.0;
       image_rect.origin.y
 	+= (cellFrame.size.height - image_rect.size.height) / 2.0;
-      [image setBackgroundColor: backColor];
       /*
        * Images are always drawn with their bottom-left corner at the origin
        * so we must adjust the position to take account of a flipped view.
Index: NSButtonCell.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/NSButtonCell.m,v
retrieving revision 1.77
diff -u -r1.77 NSButtonCell.m
--- NSButtonCell.m	13 Jun 2003 15:01:11 -0000	1.77
+++ NSButtonCell.m	26 Jul 2003 06:54:05 -0000
@@ -718,12 +718,6 @@
 
   if (imageToDisplay)
     {
-      /* FIXME - the following is a hack!  Because we don't seem to be
-	 getting alpha composing of images right, we use this hack of
-	 hard-setting manually the background color of the image to
-	 the wanted background color ... this should go away when
-	 alpha composing of images works 100%.  */
-      [imageToDisplay setBackgroundColor: backgroundColor];
       imageSize = [imageToDisplay size];
     }
 
Index: NSMenuItemCell.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/NSMenuItemCell.m,v
retrieving revision 1.37
diff -u -r1.37 NSMenuItemCell.m
--- NSMenuItemCell.m	13 Jun 2003 15:01:11 -0000	1.37
+++ NSMenuItemCell.m	26 Jul 2003 06:54:07 -0000
@@ -47,7 +47,6 @@
 
 static Class	colorClass = 0;		/* Cache color class.	*/
 static NSImage	*arrowImage = nil;	/* Cache arrow image.	*/
-static NSImage	*arrowImageH = nil;
 
 
 + (void) initialize
@@ -57,7 +56,6 @@
       [self setVersion: 2];
       colorClass = [NSColor class];
       arrowImage = [[NSImage imageNamed: @"common_3DArrowRight"] copy];
-      arrowImageH = [[NSImage imageNamed: @"common_3DArrowRightH"] copy];
     }
 }
 
@@ -387,8 +385,6 @@
   if ([controlView isFlipped])
     position.y += size.height;
 
-  if (nil != _backgroundColor)
-    [_imageToDisplay setBackgroundColor: _backgroundColor];
   [_imageToDisplay compositeToPoint: position operation: NSCompositeSourceOver];
 }
 
@@ -401,13 +397,8 @@
     {
       NSSize	size;
       NSPoint	position;
-      NSImage	*imageToDraw;
 
-      if (_cell.is_highlighted)
-	imageToDraw = arrowImageH;
-      else
-	imageToDraw = arrowImage;
-      size = [imageToDraw size];
+      size = [arrowImage size];
       position.x = cellFrame.origin.x + cellFrame.size.width - size.width;
       position.y = MAX(NSMidY(cellFrame) - (size.height/2.), 0.);
       /*
@@ -417,9 +408,7 @@
       if ([controlView isFlipped])
 	position.y += size.height;
 
-      if (nil != _backgroundColor)
-	[imageToDraw setBackgroundColor: _backgroundColor];
-      [imageToDraw compositeToPoint: position operation: NSCompositeSourceOver];
+      [arrowImage compositeToPoint: position operation: NSCompositeSourceOver];
     }
   /* FIXME/TODO here - decide a consistent policy for images.
    *
@@ -490,10 +479,6 @@
       position.y += size.height;
     }
   
-  if (nil != _backgroundColor)
-    {
-      [imageToDisplay setBackgroundColor: _backgroundColor];
-    }
   [imageToDisplay compositeToPoint: position operation: NSCompositeSourceOver];
 }
 
Index: NSScroller.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/NSScroller.m,v
retrieving revision 1.70
diff -u -r1.70 NSScroller.m
--- NSScroller.m	13 Jun 2003 15:01:12 -0000	1.70
+++ NSScroller.m	26 Jul 2003 06:54:09 -0000
@@ -242,36 +242,32 @@
     return;
 
   upCell = [NSButtonCell new];
-  [upCell setHighlightsBy: NSChangeBackgroundCellMask|NSContentsCellMask];
+  [upCell setHighlightsBy: NSChangeBackgroundCellMask];
   [upCell setImage: [NSImage imageNamed: @"common_ArrowUp"]];
-  [upCell setAlternateImage: [NSImage imageNamed: @"common_ArrowUpH"]];
   [upCell setImagePosition: NSImageOnly];
   [upCell setContinuous: YES];
   [upCell sendActionOn: (NSLeftMouseDownMask | NSPeriodicMask)];
   [upCell setPeriodicDelay: 0.3 interval: 0.03];
 
   downCell = [NSButtonCell new];
-  [downCell setHighlightsBy: NSChangeBackgroundCellMask|NSContentsCellMask];
+  [downCell setHighlightsBy: NSChangeBackgroundCellMask];
   [downCell setImage: [NSImage imageNamed: @"common_ArrowDown"]];
-  [downCell setAlternateImage: [NSImage imageNamed: @"common_ArrowDownH"]];
   [downCell setImagePosition: NSImageOnly];
   [downCell setContinuous: YES];
   [downCell sendActionOn: (NSLeftMouseDownMask | NSPeriodicMask)];
   [downCell setPeriodicDelay: 0.3 interval: 0.03];
 
   leftCell = [NSButtonCell new];
-  [leftCell setHighlightsBy: NSChangeBackgroundCellMask|NSContentsCellMask];
+  [leftCell setHighlightsBy: NSChangeBackgroundCellMask];
   [leftCell setImage: [NSImage imageNamed: @"common_ArrowLeft"]];
-  [leftCell setAlternateImage: [NSImage imageNamed: @"common_ArrowLeftH"]];
   [leftCell setImagePosition: NSImageOnly];
   [leftCell setContinuous: YES];
   [leftCell sendActionOn: (NSLeftMouseDownMask | NSPeriodicMask)];
   [leftCell setPeriodicDelay: 0.3 interval: 0.03];
 
   rightCell = [NSButtonCell new];
-  [rightCell setHighlightsBy: NSChangeBackgroundCellMask|NSContentsCellMask];
+  [rightCell setHighlightsBy: NSChangeBackgroundCellMask];
   [rightCell setImage: [NSImage imageNamed: @"common_ArrowRight"]];
-  [rightCell setAlternateImage: [NSImage imageNamed: @"common_ArrowRightH"]];
   [rightCell setImagePosition: NSImageOnly];
   [rightCell setContinuous: YES];
   [rightCell sendActionOn: (NSLeftMouseDownMask | NSPeriodicMask)];
Index: NSTableHeaderCell.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/NSTableHeaderCell.m,v
retrieving revision 1.18
diff -u -r1.18 NSTableHeaderCell.m
--- NSTableHeaderCell.m	13 Jun 2003 15:01:12 -0000	1.18
+++ NSTableHeaderCell.m	26 Jul 2003 06:54:09 -0000
@@ -165,13 +165,6 @@
 	    bg = hbgCol;
 	  [bg set];
 	  NSRectFill (cellFrame);
-	  if (_cell_image)
-	    [_cell_image setBackgroundColor: bg];
-	}
-      else
-	{
-	  if (_cell_image)
-	    [_cell_image setBackgroundColor: clearCol];
 	}
       // Draw the image
       if (_cell_image)