fix more 64bit warnings

src/views/mac/SkOptionsTableView.mm

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #import "SkOptionsTableView.h"
 #import "SkTextFieldCell.h"
@@ skipping 48 matching lines @@
     // the first menu is always assumed to be the static, the second is
     // repopulated every time over and over again
 
     // seems pretty weird that we have to get rid of the const'ness here,
     // but trying to propagate the const'ness through all the way to the fMenus
     // vector was a non-starter.
 
     int menuIndex = fMenus->find(const_cast<SkOSMenu *>(menu));
     if (menuIndex >= 0 && menuIndex < fMenus->count()) {
         NSUInteger first = 0;
-        for (NSInteger i = 0; i < menuIndex; ++i) {
+        for (int i = 0; i < menuIndex; ++i) {
             first += (*fMenus)[i]->getCount();
         }
         [fItems removeObjectsInRange:NSMakeRange(first, [fItems count] - first)];
         [self loadMenu:menu];
     }
     [self reloadData];
 }
 
 - (NSCellStateValue)triStateToNSState:(SkOSMenu::TriState)state {
     if (SkOSMenu::kOnState == state)
@@ skipping 61 matching lines @@
         [fItems addObject:option];
         [option release];
     }
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
     return [self.fItems count];
 }
 
 - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
+    NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
     if (columnIndex == 0) {
         const SkOSMenu::Item* item = ((SkOptionItem*)[fItems objectAtIndex:row]).fItem;
         NSString* label = [NSString stringWithUTF8String:item->getLabel()];
         if (fShowKeys)
             return [NSString stringWithFormat:@"%@ (%c)", label, item->getKeyEquivalent()];
         else
             return label;
     }
     else
         return nil;
 }
 
 - (NSCell *)tableView:(NSTableView *)tableView dataCellForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
     if (tableColumn) {
-        int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
+        NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
         if (columnIndex == 1)
             return [((SkOptionItem*)[fItems objectAtIndex:row]).fCell copy];
         else
             return [[[SkTextFieldCell alloc] init] autorelease];
     }
     return nil;
 }
 
 - (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
+    NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
     if (columnIndex == 1) {
         SkOptionItem* option = (SkOptionItem*)[self.fItems objectAtIndex:row];
         NSCell* storedCell = option.fCell;
         const SkOSMenu::Item* item = option.fItem;
         switch (item->getType()) {
             case SkOSMenu::kAction_Type:
                 break;
             case SkOSMenu::kList_Type:
                 [cell selectItemAtIndex:[(NSPopUpButtonCell*)storedCell indexOfSelectedItem]];
                 break;
@@ skipping 13 matching lines @@
             default:
                 break;
         }
     }
     else {
         [(SkTextFieldCell*)cell setEditable:NO];
     }
 }
 
 - (void)tableView:(NSTableView *)tableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
+    NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]];
     if (columnIndex == 1) {
         SkOptionItem* option = (SkOptionItem*)[self.fItems objectAtIndex:row];
         NSCell* cell = option.fCell;
         const SkOSMenu::Item* item = option.fItem;
         switch (item->getType()) {
             case SkOSMenu::kAction_Type:
                 item->postEvent();
                 break;
             case SkOSMenu::kList_Type:
                 [(NSPopUpButtonCell*)cell selectItemAtIndex:[anObject intValue]];
@@ skipping 67 matching lines @@
 
 - (NSCell*)createTriState:(NSCellStateValue)state {
     NSButtonCell* cell = [[[NSButtonCell alloc] init] autorelease];
     [cell setAllowsMixedState:TRUE];
     [cell setTitle:@""];
     [cell setState:(NSInteger)state];
     [cell setButtonType:NSSwitchButton];
     return cell;
 }
 @end