From 7c09fe33ca74eb1d09ee4a4ff96b55f7e23ca33b Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 21 Sep 1999 15:42:14 +0000
Subject: [PATCH] GUI updates

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4928 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog              |  9 ++++++++
 Source/NSBrowserCell.m | 51 +++++++++++++++++++-----------------------
 Source/NSButtonCell.m  | 26 ---------------------
 3 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a686ba34a..e3d93e71c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-09-21  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSBrowserCell.m (-drawInteriorWithFrame:inView:): Put
+	arrow at extreme right of cell (patch from Tim Bissell
+	<tim_bissell@yahoo.co.uk>).
+
+	* Source/NSButtonsCell.m (-performClick:) Remove (duplicate of
+	NSCell method).
+
 Tue Sep 15  1999  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	(NB. The above date reflects submission of the patch - sorry I didn't
diff --git a/Source/NSBrowserCell.m b/Source/NSBrowserCell.m
index ecef5602b..9aff048f7 100644
--- a/Source/NSBrowserCell.m
+++ b/Source/NSBrowserCell.m
@@ -277,46 +277,41 @@ static Class	colorClass;
   control_view = controlView;		// remember last view cell was drawn in
   [controlView lockFocus];
   if (cell_highlighted || cell_state)		// temporary hack FAR FIX ME?
-    {
+  {
       backColor = [colorClass selectedControlColor];
       [backColor set];
       if (!_isLeaf)
-	{
-	  image = _highlightBranchImage;
-	  image_rect.size.height = cellFrame.size.height;
-	  image_rect.size.width = image_rect.size.height;
-													  // Right justify
-	  image_rect.origin.x += cellFrame.size.width - image_rect.size.width;
-	  image_rect.origin.y
-	    = MAX(NSMidY(image_rect) - ([image size].height/2.),0.);
-	}
+      {
+          image = _highlightBranchImage;
+      }
       else
-	image_rect = NSZeroRect;
-    }
+          image_rect = NSZeroRect;
+  }
   else
-    {
+  {
       backColor = [[controlView window] backgroundColor];
       [backColor set];
       if (!_isLeaf)
-	{
-	  image = _branchImage;
-	  image_rect.size.height = cellFrame.size.height;
-	  image_rect.size.width = image_rect.size.height;
-	  // Right justify
-	  image_rect.origin.x += cellFrame.size.width - image_rect.size.width;
-	  image_rect.origin.y
-	    = MAX(NSMidY(image_rect) - ([image size].height/2.),0.);
-	}
+      {
+          image = _branchImage;
+      }
       else
-	image_rect = NSZeroRect;
-    }
+          image_rect = NSZeroRect;
+  }
+
+  image_rect.size = [image size];
+													  // Right justify
+  image_rect.origin.x += cellFrame.size.width - image_rect.size.width - 1.0;
+  image_rect.origin.y += (cellFrame.size.height - image_rect.size.height) / 2.0;
+//MAX(NSMidY(image_rect) - ([image size].height/2.),0.);
+
   NSRectFill(cellFrame);	// Clear the background
 
   title_rect.size.width -= image_rect.size.width + 4;	// draw the title cell
   [_browserText drawWithFrame: title_rect inView: controlView];
 
   if (image)
-    {
+  {
       NSPoint position = image_rect.origin;
 
       [image setBackgroundColor: backColor];
@@ -343,13 +338,13 @@ static Class	colorClass;
   NSPoint location = [controlView convertPoint: [theEvent locationInWindow]
 				      fromView: nil];
 
-fprintf(stderr, " NSBrowserCell: editWithFrame --- ");
+  NSDebugLog(@" NSBrowserCell: editWithFrame --- ");
 
   [_browserText _setCursorLocation: location];
   [_browserText _setCursorVisibility: YES];
 
   if ([[controlView window] makeFirstResponder: controlView])
-    fprintf(stderr, " XRBrowserCell: we are now first responder --- ");
+    NSDebugLog(@" NSBrowserCell: we are now first responder --- ");
 
   [self drawInteriorWithFrame: aRect inView: controlView];
 }
@@ -361,7 +356,7 @@ fprintf(stderr, " NSBrowserCell: editWithFrame --- ");
 
 - (void) _handleKeyEvent: (NSEvent*)keyEvent
 {
-  fprintf(stderr, " NSBrowserCell: _handleKeyEvent --- ");
+  NSDebugLog(@" NSBrowserCell: _handleKeyEvent --- ");
 
   [_browserText _handleKeyEvent: keyEvent];
 
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 57af02457..2492bd368 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -183,32 +183,6 @@
   [self setContinuous: YES];
 }
 
-- (void) performClick: (id)sender
-{
-  NSView	*cv;
-
-  if (control_view)
-    cv = control_view;
-  else 
-    cv = [NSView focusView];
-
-  [self highlight: YES withFrame: [cv frame] inView: cv];
-  if (action)
-    {
-      NS_DURING
-	{
-	  [(NSControl*)cv sendAction: action to: target];
-	}
-      NS_HANDLER
-	{
-	  [self highlight: NO withFrame: [cv frame] inView: cv];
-          [localException raise];
-	}
-      NS_ENDHANDLER
-    }
-  [self highlight: NO withFrame: [cv frame] inView: cv];
-}
-
 //
 // Setting the Key Equivalent
 //