From dad8e3552335557c458c79b3c7c81f0ec078d665 Mon Sep 17 00:00:00 2001
From: Sergey Bugaev <bugaevc@gmail.com>
Date: Sun, 7 Jan 2018 01:24:52 +0300
Subject: [PATCH] Fix a few more missing NSUInteger's in NSMenu.subproj

---
 AppKit/NSMenu.subproj/NSMainMenuView.m     | 10 +++++-----
 AppKit/NSMenu.subproj/NSMenuView.h         |  6 +++---
 AppKit/NSMenu.subproj/NSMenuView.m         | 20 ++++++++++----------
 AppKit/NSMenu.subproj/NSMenuWindow.h       |  2 +-
 AppKit/NSMenu.subproj/NSMenuWindow.m       |  2 +-
 AppKit/NSMenu.subproj/NSOverflowMenuView.h |  4 ++--
 AppKit/NSMenu.subproj/NSOverflowMenuView.m |  2 +-
 AppKit/NSMenu.subproj/NSSubmenuView.m      |  8 ++++----
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/AppKit/NSMenu.subproj/NSMainMenuView.m b/AppKit/NSMenu.subproj/NSMainMenuView.m
index e3ee6825..d25129e9 100755
--- a/AppKit/NSMenu.subproj/NSMainMenuView.m
+++ b/AppKit/NSMenu.subproj/NSMainMenuView.m
@@ -162,7 +162,7 @@ static void drawSunkenBorder(NSRect rect){
 -(void)drawRect:(NSRect)rect {
 	NSRect        bounds=[self bounds];
 	NSArray      *items=[[self menu] itemArray];
-	int           i,count=[items count];
+	NSUInteger    i,count=[items count];
 	NSRect        previousBorderRect=NSMakeRect(0,0,0,0);
 	BOOL          overflow=NO;
 	NSPoint       mouseLoc = [[NSApp currentEvent] locationInWindow];
@@ -214,10 +214,10 @@ static void drawSunkenBorder(NSRect rect){
 	}
 }
 
--(unsigned)overflowIndex {
+-(NSUInteger)overflowIndex {
    NSRect        bounds=[self bounds];
    NSArray      *items=[[self menu] itemArray];
-   unsigned      i,count=[items count];
+   NSUInteger    i,count=[items count];
    NSRect        previousBorderRect=NSMakeRect(0,0,0,0);
 
    for(i=0;i<count;i++){
@@ -238,7 +238,7 @@ static void drawSunkenBorder(NSRect rect){
    NSUInteger    result=NSNotFound;
    NSRect        bounds=[self bounds];
    NSArray      *items=[[self menu] itemArray];
-   unsigned      i,count=[items count];
+   NSUInteger    i,count=[items count];
    NSRect        previousBorderRect=NSMakeRect(0,0,0,0);
    BOOL          overflow=NO;
 
@@ -268,7 +268,7 @@ static void drawSunkenBorder(NSRect rect){
    NSRect        branchFrame=[branch frame];
    NSRect        screenVisible=[screen visibleFrame];
    NSArray      *items=[[self menu] itemArray];
-   unsigned      i,count=[items count];
+   NSUInteger    i,count=[items count];
    NSRect        previousBorderRect=NSMakeRect(0,0,0,0);
    NSRect        itemRect=NSZeroRect;
    NSPoint       topLeft=NSZeroPoint;
diff --git a/AppKit/NSMenu.subproj/NSMenuView.h b/AppKit/NSMenu.subproj/NSMenuView.h
index 4de67554..7020f8a7 100644
--- a/AppKit/NSMenu.subproj/NSMenuView.h
+++ b/AppKit/NSMenu.subproj/NSMenuView.h
@@ -13,9 +13,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     NSMutableArray *_visibleArray;
 }
 
-- (unsigned)itemIndexAtPoint:(NSPoint)point;
-- (unsigned)selectedItemIndex;
-- (void)setSelectedItemIndex:(unsigned)itemIndex;
+- (NSUInteger)itemIndexAtPoint:(NSPoint)point;
+- (NSUInteger)selectedItemIndex;
+- (void)setSelectedItemIndex:(NSUInteger)itemIndex;
 
 - (NSArray *)visibleItemArray;
 - (NSMenuItem *)itemAtSelectedIndex;
diff --git a/AppKit/NSMenu.subproj/NSMenuView.m b/AppKit/NSMenu.subproj/NSMenuView.m
index bebaf947..4fd792bb 100755
--- a/AppKit/NSMenu.subproj/NSMenuView.m
+++ b/AppKit/NSMenu.subproj/NSMenuView.m
@@ -28,16 +28,16 @@ enum {
    [super dealloc];
 }
 
--(unsigned)itemIndexAtPoint:(NSPoint)point {
+-(NSUInteger)itemIndexAtPoint:(NSPoint)point {
    NSInvalidAbstractInvocation();
    return NSNotFound;
 }
 
--(unsigned)selectedItemIndex {
+-(NSUInteger)selectedItemIndex {
    return _selectedItemIndex;
 }
 
--(void)setSelectedItemIndex:(unsigned)itemIndex {
+-(void)setSelectedItemIndex:(NSUInteger)itemIndex {
 	if (_selectedItemIndex != itemIndex) {
 		_selectedItemIndex=itemIndex;
 		[self setNeedsDisplay:YES];
@@ -190,7 +190,7 @@ const float kMouseMovementThreshold = .001f;
                     MENUDEBUG(@"found a menu: %@", checkView);
                     
                     // Which item is the cursor on top of?
-                    unsigned itemIndex=[checkView itemIndexAtPoint:checkPoint];
+                    NSUInteger itemIndex=[checkView itemIndexAtPoint:checkPoint];
 
                     MENUDEBUG(@"found an item index: %u", itemIndex);
 
@@ -320,10 +320,10 @@ const float kMouseMovementThreshold = .001f;
 				{
 					MENUDEBUG(@"Up...");
 					
-					unsigned oldIndex = [activeMenuView selectedItemIndex];
+					NSUInteger oldIndex = [activeMenuView selectedItemIndex];
 					NSArray *items = [activeMenuView itemArray];
 					// Look for the next enabled item by search up and wrapping around the bottom
-					unsigned newIndex = 0;
+					NSUInteger newIndex = 0;
 					if (oldIndex != NSNotFound) {
 						newIndex = oldIndex == 0 ? [items count] - 1 : oldIndex - 1;
 					}
@@ -356,10 +356,10 @@ const float kMouseMovementThreshold = .001f;
 				case kNSMenuKeyboardNavigationDown:
 				{
 					MENUDEBUG(@"Down...");
-					unsigned oldIndex = [activeMenuView selectedItemIndex];
+					NSUInteger oldIndex = [activeMenuView selectedItemIndex];
 					NSArray *items = [activeMenuView itemArray];
 					// Look for the next enabled item by search down and wrapping around to the top
-					unsigned newIndex = 0;
+					NSUInteger newIndex = 0;
 					if (oldIndex != NSNotFound) {
 						newIndex = oldIndex == [items count] -1 ? 0 : oldIndex + 1;
 					}
@@ -422,10 +422,10 @@ const float kMouseMovementThreshold = .001f;
 				{
 					MENUDEBUG(@"Letter...");
 					NSString *letterString = [[NSString stringWithCharacters: &ch length: 1] uppercaseString];
-					unsigned oldIndex = [activeMenuView selectedItemIndex];
+					NSUInteger oldIndex = [activeMenuView selectedItemIndex];
 					NSArray *items = [activeMenuView itemArray];
 					// Look for the next enabled item by search down and wrapping around to the top
-					unsigned newIndex = 0;
+					NSUInteger newIndex = 0;
 					if (oldIndex != NSNotFound) {
 						newIndex = oldIndex == [items count] -1 ? 0 : oldIndex + 1;
 					}
diff --git a/AppKit/NSMenu.subproj/NSMenuWindow.h b/AppKit/NSMenu.subproj/NSMenuWindow.h
index 5104ccad..31aa1418 100644
--- a/AppKit/NSMenu.subproj/NSMenuWindow.h
+++ b/AppKit/NSMenu.subproj/NSMenuWindow.h
@@ -15,7 +15,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 }
 
 - initWithMenu:(NSMenu *)menu;
-- initWithMenu:(NSMenu *)menu overflowAtIndex:(unsigned)overflowIndex;
+- initWithMenu:(NSMenu *)menu overflowAtIndex:(NSUInteger)overflowIndex;
 
 - (NSMenuView *)menuView;
 
diff --git a/AppKit/NSMenu.subproj/NSMenuWindow.m b/AppKit/NSMenu.subproj/NSMenuWindow.m
index 008d6ea2..06c94284 100755
--- a/AppKit/NSMenu.subproj/NSMenuWindow.m
+++ b/AppKit/NSMenu.subproj/NSMenuWindow.m
@@ -27,7 +27,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
    return self;
 }
 
--initWithMenu:(NSMenu *)menu overflowAtIndex:(unsigned)overflowIndex {
+-initWithMenu:(NSMenu *)menu overflowAtIndex:(NSUInteger)overflowIndex {
    NSOverflowMenuView *view=[[NSOverflowMenuView alloc] initWithMenu:menu overflowAtIndex:overflowIndex];
    NSRect              contentRect=[view frame];
 
diff --git a/AppKit/NSMenu.subproj/NSOverflowMenuView.h b/AppKit/NSMenu.subproj/NSOverflowMenuView.h
index efffc651..5778ac0a 100644
--- a/AppKit/NSMenu.subproj/NSOverflowMenuView.h
+++ b/AppKit/NSMenu.subproj/NSOverflowMenuView.h
@@ -9,9 +9,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #import <AppKit/NSSubmenuView.h>
 
 @interface NSOverflowMenuView : NSSubmenuView {
-    unsigned _overflowIndex;
+    NSUInteger _overflowIndex;
 }
 
-- initWithMenu:(NSMenu *)menu overflowAtIndex:(unsigned)overflowIndex;
+- initWithMenu:(NSMenu *)menu overflowAtIndex:(NSUInteger)overflowIndex;
 
 @end
diff --git a/AppKit/NSMenu.subproj/NSOverflowMenuView.m b/AppKit/NSMenu.subproj/NSOverflowMenuView.m
index b7d68a71..fe103884 100755
--- a/AppKit/NSMenu.subproj/NSOverflowMenuView.m
+++ b/AppKit/NSMenu.subproj/NSOverflowMenuView.m
@@ -11,7 +11,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 @implementation NSOverflowMenuView
 
--initWithMenu:(NSMenu *)menu overflowAtIndex:(unsigned)overflowIndex {
+-initWithMenu:(NSMenu *)menu overflowAtIndex:(NSUInteger)overflowIndex {
    _overflowIndex=overflowIndex;
 
    return [self initWithMenu:menu];
diff --git a/AppKit/NSMenu.subproj/NSSubmenuView.m b/AppKit/NSMenu.subproj/NSSubmenuView.m
index b5232f2e..5962c017 100755
--- a/AppKit/NSMenu.subproj/NSSubmenuView.m
+++ b/AppKit/NSMenu.subproj/NSSubmenuView.m
@@ -271,9 +271,9 @@ static NSRect boundsToTitleAreaRect(NSRect rect){
 	}
 }
 
--(unsigned)itemIndexAtPoint:(NSPoint)point {
+-(NSUInteger)itemIndexAtPoint:(NSPoint)point {
    NSArray *items=[[self menu] itemArray];
-   unsigned i,count=[items count];
+   NSUInteger i,count=[items count];
    NSRect   check=boundsToTitleAreaRect([self bounds]);
 
    for(i=0;i<count;i++){
@@ -294,7 +294,7 @@ static NSRect boundsToTitleAreaRect(NSRect rect){
    NSRect   branchFrame=[branch frame];
    NSRect   screenVisible=[screen visibleFrame];
    NSArray *items=[[self menu] itemArray];
-   unsigned i,count=[items count];
+   NSUInteger i,count=[items count];
    NSRect   itemRect=boundsToTitleAreaRect([self bounds]);
    NSPoint  topLeft=NSZeroPoint;
 
@@ -438,4 +438,4 @@ static NSRect boundsToTitleAreaRect(NSRect rect){
 
 
 @end
-*/
\ No newline at end of file
+*/