* Source/NSSearchField.m,

* Source/NSSearchFieldCell.m: Small cleanups in formatting and	int types.

ChangeLog

@@ -1,3 +1,9 @@
+2020-12-12 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSSearchField.m,
+	* Source/NSSearchFieldCell.m: Small cleanups in formatting and
+	int types.
+
 2020-12-11 Riccardo Mottola <rm@gnu.org>
 
 	* Source/GSToolbarView.m,

Source/NSSearchFieldCell.m

@@ -46,6 +46,10 @@
 #import "AppKit/NSSearchFieldCell.h"
 #import "AppKit/NSWindow.h"
 
+#import "GSGuiPrivate.h"
+
+#define ICON_WIDTH	16
+
 @interface NSSearchFieldCell (Private)
 
 - (NSMenu *) _buildTemplate;
@@ -59,18 +63,6 @@
 
 @implementation NSSearchFieldCell
 
-#define ICON_WIDTH	16
-
-// Inlined method
- 
-static inline NSRect textCellFrameFromRect(NSRect cellRect) 
-// Not the drawed part, precises just the part which receives events
-{
-  return NSMakeRect(cellRect.origin.x + ICON_WIDTH,
-		    NSMinY(cellRect),
-		    NSWidth(cellRect) - 2*ICON_WIDTH,
-		    NSHeight(cellRect));
-}
 
 - (id) initTextCell: (NSString*)aString
 {
@@ -93,7 +85,6 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
 /* Don't set the searchMenuTemplate unless it is explicitly set in code or by a nib connection
       template = [self _buildTemplate];
       [self setSearchMenuTemplate: template];
-      RELEASE(template);
 */
 
       //_recent_searches = [[NSMutableArray alloc] init];
@@ -204,7 +195,7 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
 
 - (void) setRecentSearches: (NSArray*)searches
 {
-  int max;
+  NSInteger max;
   NSMutableArray *mutableSearches;
 
   max = [self maximumRecents];
@@ -310,8 +301,6 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
   [c setEditable: NO];
   [c setImagePosition: NSImageOnly];
   [c setImage: [NSImage imageNamed: @"GSSearch"]];
-//  [c setAction: [self action]];
-//  [c setTarget: [self target]];
   [c setAction: @selector(performClick:)];
   [c setTarget: self];
   [c sendActionOn: NSLeftMouseUpMask];
@@ -455,13 +444,14 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
 
 - (void) resetCursorRect: (NSRect)cellFrame inView: (NSView *)controlView
 {
-  [super resetCursorRect: textCellFrameFromRect(cellFrame)
+  [super resetCursorRect: [self searchTextRectForBounds: cellFrame]
 		  inView: controlView];
 }
 
 - (void) textDidChange: (NSNotification *)notification
 {
   NSText *textObject;
+
   [_control_view setNeedsDisplay: YES];
 
   // make textChanged send action (unless disabled)
@@ -560,36 +550,36 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
 
   template = [[NSMenu alloc] init];
 
-  item = [[NSMenuItem alloc] initWithTitle: @"Recent searches"
+  item = [[NSMenuItem alloc] initWithTitle: _(@"Recent searches")
 			     action: NULL
 			     keyEquivalent: @""];
   [item setTag: NSSearchFieldRecentsTitleMenuItemTag];
   [template addItem: item];
   RELEASE(item);
 
-  item = [[NSMenuItem alloc] initWithTitle: @"Recent search item"
+  item = [[NSMenuItem alloc] initWithTitle: _(@"Recent search item")
 			     action: @selector(search:)
 			     keyEquivalent: @""];
   [item setTag: NSSearchFieldRecentsMenuItemTag];
   [template addItem: item];
   RELEASE(item);
 
-  item = [[NSMenuItem alloc] initWithTitle: @"Clear recent searches"
+  item = [[NSMenuItem alloc] initWithTitle: _(@"Clear recent searches")
 			     action: @selector(_clearSearches:)
 			     keyEquivalent: @""];
   [item setTag: NSSearchFieldClearRecentsMenuItemTag];
   [item setTarget: self];
   [template addItem: item];
-  
   RELEASE(item);
-  item = [[NSMenuItem alloc] initWithTitle: @"No recent searches"
+
+  item = [[NSMenuItem alloc] initWithTitle: _(@"No recent searches")
 			     action: NULL
 			     keyEquivalent: @""];
   [item setTag: NSSearchFieldNoRecentsMenuItemTag];
   [template addItem: item];
   RELEASE(item);
 
-  return template;
+  return AUTORELEASE(template);
 }
 
 - (void) _openPopup: (id)sender
@@ -599,10 +589,10 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
   NSMenuView *mr;
   NSWindow *cvWin;
   NSRect cellFrame;
-  int i;
-  int recentCount = [_recent_searches count];
+  NSInteger i;
+  NSInteger recentCount = [_recent_searches count];
   NSPopUpButtonCell *pbcell = [[NSPopUpButtonCell alloc] initTextCell: nil pullsDown: NO];
-  int selectedItemIndex = -1, newSelectedItemIndex;
+  NSInteger selectedItemIndex = -1, newSelectedItemIndex;
 
   template = [self searchMenuTemplate];
   popupmenu = [[NSMenu alloc] init];
@@ -610,7 +600,7 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
   // Fill the popup menu
   for (i = 0; i < [template numberOfItems]; i++)
     {
-      int tag;
+      NSInteger tag;
       NSMenuItem *item, *newItem = nil;
 
       item = (NSMenuItem*)[template itemAtIndex: i];
@@ -642,7 +632,7 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
         }
       else if (tag == NSSearchFieldRecentsMenuItemTag)
         {
-          int j;
+          NSInteger j;
 
           for (j = 0; j < recentCount; j++)
             {
@@ -692,7 +682,7 @@ static inline NSRect textCellFrameFromRect(NSRect cellRect)
   if (newSelectedItemIndex != selectedItemIndex && newSelectedItemIndex != -1
       && newSelectedItemIndex < [template numberOfItems])
     {
-      int tag = [[template itemAtIndex:newSelectedItemIndex] tag];
+      NSInteger tag = [[template itemAtIndex:newSelectedItemIndex] tag];
       if (tag != NSSearchFieldRecentsTitleMenuItemTag && tag != NSSearchFieldClearRecentsMenuItemTag
           && tag != NSSearchFieldNoRecentsMenuItemTag && tag != NSSearchFieldRecentsMenuItemTag
           && ![[template itemAtIndex:newSelectedItemIndex] isSeparatorItem])