gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 19:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix all current compiler warnings on FreeBSD/x86-64.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36038 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
theraven 2013-01-30 09:48:54 +00:00
parent 14b195c4a0
commit 30eb57e642
41 changed files with 266 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ColorPickers/GSNamedColorPicker.m
View file

@ -175,13 +175,13 @@
} }
-(NSString *) browser: (NSBrowser *)sender -(NSString *) browser: (NSBrowser *)sender
titleOfColumn: (int)column titleOfColumn: (NSInteger)column
{ {
return nil; return nil;
} }
-(void) browser: (NSBrowser *)sender -(void) browser: (NSBrowser *)sender
createRowsForColumn: (int)column createRowsForColumn: (NSInteger)column
inMatrix: (NSMatrix *)matrix inMatrix: (NSMatrix *)matrix
{ {
int i; int i;
@ -215,16 +215,16 @@ createRowsForColumn: (int)column
} }
- (BOOL) browser: (NSBrowser*)sender - (BOOL) browser: (NSBrowser*)sender
selectRow: (int)row selectRow: (NSInteger)row
inColumn: (int)column inColumn: (NSInteger)column
{ {
return NO; return NO;
} }
- (void) browser: (NSBrowser *)sender - (void) browser: (NSBrowser *)sender
willDisplayCell: (id)cell willDisplayCell: (id)cell
atRow: (int)row atRow: (NSInteger)row
column: (int)column column: (NSInteger)column
{ {
} }

2
Headers/Additions/GNUstepGUI/GSDisplayServer.h
View file

@ -157,7 +157,7 @@ APPKIT_EXPORT NSString *GSScreenNumber;
- (void) docedited: (int) edited : (int)win; - (void) docedited: (int) edited : (int)win;
- (void) setinputstate: (int)state : (int)win; - (void) setinputstate: (int)state : (int)win;
- (void) setinputfocus: (int)win; - (void) setinputfocus: (int)win;
- (void) setalpha: (float)alpha: (int)win; - (void) setalpha: (float)alpha : (int)win;
- (void) setShadow: (BOOL)hasShadow : (int)win; - (void) setShadow: (BOOL)hasShadow : (int)win;
- (NSPoint) mouselocation; - (NSPoint) mouselocation;

2
Headers/AppKit/NSArrayController.h
View file

@ -40,7 +40,7 @@
@interface NSArrayController : NSObjectController @interface NSArrayController : NSObjectController
{ {
NSMutableArray *_arranged_objects; NSArray *_arranged_objects;
NSIndexSet *_selection_indexes; NSIndexSet *_selection_indexes;
NSArray *_sort_descriptors; NSArray *_sort_descriptors;
NSPredicate *_filter_predicate; NSPredicate *_filter_predicate;

84
Headers/AppKit/NSBrowser.h
View file

@ -154,11 +154,11 @@ typedef enum _NSBrowserColumnResizingType
// //
// Setting the NSBrowser's Appearance // Setting the NSBrowser's Appearance
// //
- (int) maxVisibleColumns; - (NSInteger) maxVisibleColumns;
- (int) minColumnWidth; - (NSInteger) minColumnWidth;
- (BOOL) separatesColumns; - (BOOL) separatesColumns;
- (void) setMaxVisibleColumns: (int)columnCount; - (void) setMaxVisibleColumns: (NSInteger)columnCount;
- (void) setMinColumnWidth: (int)columnWidth; - (void) setMinColumnWidth: (NSInteger)columnWidth;
- (void) setSeparatesColumns: (BOOL)flag; - (void) setSeparatesColumns: (BOOL)flag;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (float) columnWidthForColumnContentWidth: (float)columnContentWidth; - (float) columnWidthForColumnContentWidth: (float)columnContentWidth;
@ -169,21 +169,21 @@ typedef enum _NSBrowserColumnResizingType
// Manipulating Columns // Manipulating Columns
// //
- (void) addColumn; - (void) addColumn;
- (int) columnOfMatrix: (NSMatrix *)matrix; - (NSInteger) columnOfMatrix: (NSMatrix *)matrix;
- (void) displayAllColumns; - (void) displayAllColumns;
- (void) displayColumn: (int)column; - (void) displayColumn: (NSInteger)column;
- (int) firstVisibleColumn; - (NSInteger) firstVisibleColumn;
- (BOOL) isLoaded; - (BOOL) isLoaded;
- (int) lastColumn; - (NSInteger) lastColumn;
- (int) lastVisibleColumn; - (NSInteger) lastVisibleColumn;
- (void) loadColumnZero; - (void) loadColumnZero;
- (int) numberOfVisibleColumns; - (NSInteger) numberOfVisibleColumns;
- (void) reloadColumn: (int)column; - (void) reloadColumn: (NSInteger)column;
- (void) selectAll: (id)sender; - (void) selectAll: (id)sender;
- (void) selectRow: (int)row inColumn: (int)column; - (void) selectRow: (NSInteger)row inColumn: (NSInteger)column;
- (int) selectedColumn; - (NSInteger) selectedColumn;
- (int) selectedRowInColumn: (int)column; - (NSInteger) selectedRowInColumn: (NSInteger)column;
- (void) setLastColumn: (int)column; - (void) setLastColumn: (NSInteger)column;
- (void) validateVisibleColumns; - (void) validateVisibleColumns;
// //
@ -191,25 +191,25 @@ typedef enum _NSBrowserColumnResizingType
// //
- (void) drawTitle: (NSString *)title - (void) drawTitle: (NSString *)title
inRect: (NSRect)aRect inRect: (NSRect)aRect
ofColumn: (int)column; ofColumn: (NSInteger)column;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void) drawTitleOfColumn: (int)column - (void) drawTitleOfColumn: (NSInteger)column
inRect: (NSRect)aRect; inRect: (NSRect)aRect;
#endif #endif
- (BOOL) isTitled; - (BOOL) isTitled;
- (void) setTitled: (BOOL)flag; - (void) setTitled: (BOOL)flag;
- (void) setTitle: (NSString *)aString - (void) setTitle: (NSString *)aString
ofColumn: (int)column; ofColumn: (NSInteger)column;
- (NSRect) titleFrameOfColumn: (int)column; - (NSRect) titleFrameOfColumn: (NSInteger)column;
- (float) titleHeight; - (float) titleHeight;
- (NSString *) titleOfColumn: (int)column; - (NSString *) titleOfColumn: (NSInteger)column;
// //
// Scrolling an NSBrowser // Scrolling an NSBrowser
// //
- (void) scrollColumnsLeftBy: (int)shiftAmount; - (void) scrollColumnsLeftBy: (NSInteger)shiftAmount;
- (void) scrollColumnsRightBy: (int)shiftAmount; - (void) scrollColumnsRightBy: (NSInteger)shiftAmount;
- (void) scrollColumnToVisible: (int)column; - (void) scrollColumnToVisible: (NSInteger)column;
- (void) scrollViaScroller: (NSScroller *)sender; - (void) scrollViaScroller: (NSScroller *)sender;
- (void) updateScroller; - (void) updateScroller;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
@ -225,25 +225,25 @@ typedef enum _NSBrowserColumnResizingType
// //
// Getting Matrices and Cells // Getting Matrices and Cells
// //
- (id) loadedCellAtRow: (int)row - (id) loadedCellAtRow: (NSInteger)row
column: (int)column; column: (NSInteger)column;
- (NSMatrix *) matrixInColumn: (int)column; - (NSMatrix *) matrixInColumn: (NSInteger)column;
- (id) selectedCell; - (id) selectedCell;
- (id) selectedCellInColumn: (int)column; - (id) selectedCellInColumn: (NSInteger)column;
- (NSArray *) selectedCells; - (NSArray *) selectedCells;
// //
// Getting Column Frames // Getting Column Frames
// //
- (NSRect) frameOfColumn: (int)column; - (NSRect) frameOfColumn: (NSInteger)column;
- (NSRect) frameOfInsideOfColumn: (int)column; - (NSRect) frameOfInsideOfColumn: (NSInteger)column;
// //
// Manipulating Paths // Manipulating Paths
// //
- (NSString *) path; - (NSString *) path;
- (NSString *) pathSeparator; - (NSString *) pathSeparator;
- (NSString *) pathToColumn: (int)column; - (NSString *) pathToColumn: (NSInteger)column;
- (BOOL) setPath: (NSString *)path; - (BOOL) setPath: (NSString *)path;
- (void) setPathSeparator: (NSString *)aString; - (void) setPathSeparator: (NSString *)aString;
@ -260,8 +260,8 @@ typedef enum _NSBrowserColumnResizingType
- (void) setColumnResizingType:(NSBrowserColumnResizingType) type; - (void) setColumnResizingType:(NSBrowserColumnResizingType) type;
- (BOOL) prefersAllColumnUserResizing; - (BOOL) prefersAllColumnUserResizing;
- (void) setPrefersAllColumnUserResizing: (BOOL)flag; - (void) setPrefersAllColumnUserResizing: (BOOL)flag;
- (float) widthOfColumn: (int)column; - (float) widthOfColumn: (NSInteger)column;
- (void) setWidth: (float)columnWidth ofColumn: (int)columnIndex; - (void) setWidth: (float)columnWidth ofColumn: (NSInteger)columnIndex;
// //
// Autosave names // Autosave names
@ -287,29 +287,29 @@ typedef enum _NSBrowserColumnResizingType
// //
@interface NSObject (NSBrowserDelegate) @interface NSObject (NSBrowserDelegate)
- (void) browser: (NSBrowser *)sender createRowsForColumn: (int)column - (void) browser: (NSBrowser *)sender createRowsForColumn: (NSInteger)column
inMatrix: (NSMatrix *)matrix; inMatrix: (NSMatrix *)matrix;
/** Returns YES iff */ /** Returns YES iff */
- (BOOL) browser: (NSBrowser *)sender isColumnValid: (int)column; - (BOOL) browser: (NSBrowser *)sender isColumnValid: (NSInteger)column;
- (int) browser: (NSBrowser *)sender numberOfRowsInColumn: (int)column; - (NSInteger) browser: (NSBrowser *)sender numberOfRowsInColumn: (NSInteger)column;
- (BOOL) browser: (NSBrowser *)sender selectCellWithString: (NSString *)title - (BOOL) browser: (NSBrowser *)sender selectCellWithString: (NSString *)title
inColumn: (int)column; inColumn: (NSInteger)column;
- (BOOL) browser: (NSBrowser *)sender selectRow: (int)row inColumn: (int)column; - (BOOL) browser: (NSBrowser *)sender selectRow: (NSInteger)row inColumn: (NSInteger)column;
- (NSString *) browser: (NSBrowser *)sender titleOfColumn: (int)column; - (NSString *) browser: (NSBrowser *)sender titleOfColumn: (NSInteger)column;
- (void) browser: (NSBrowser *)sender - (void) browser: (NSBrowser *)sender
willDisplayCell: (id)cell willDisplayCell: (id)cell
atRow: (int)row atRow: (NSInteger)row
column: (int)column; column: (NSInteger)column;
- (void) browserDidScroll: (NSBrowser *)sender; - (void) browserDidScroll: (NSBrowser *)sender;
- (void) browserWillScroll: (NSBrowser *)sender; - (void) browserWillScroll: (NSBrowser *)sender;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (float) browser: (NSBrowser *)browser - (float) browser: (NSBrowser *)browser
shouldSizeColumn: (int)column shouldSizeColumn: (NSInteger)column
forUserResize: (BOOL)flag forUserResize: (BOOL)flag
toWidth: (float)width; toWidth: (float)width;
- (float) browser: (NSBrowser *)browser - (float) browser: (NSBrowser *)browser
sizeToFitWidthOfColumn: (int)column; sizeToFitWidthOfColumn: (NSInteger)column;
- (void) browserColumnConfigurationDidChange: (NSNotification *)notification; - (void) browserColumnConfigurationDidChange: (NSNotification *)notification;
#endif #endif
@end @end

6
Headers/AppKit/NSControl.h
View file

@ -115,8 +115,8 @@
- (void)setAlignment:(NSTextAlignment)mode; - (void)setAlignment:(NSTextAlignment)mode;
- (void)setFont:(NSFont *)fontObject; - (void)setFont:(NSFont *)fontObject;
- (void)setFloatingPointFormat:(BOOL)autoRange - (void)setFloatingPointFormat:(BOOL)autoRange
left:(unsigned)leftDigits left:(NSUInteger)leftDigits
right:(unsigned)rightDigits; right:(NSUInteger)rightDigits;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void)setFormatter:(NSFormatter*)newFormatter; - (void)setFormatter:(NSFormatter*)newFormatter;
- (id)formatter; - (id)formatter;
@ -155,7 +155,7 @@
- (BOOL)isContinuous; - (BOOL)isContinuous;
- (BOOL)sendAction:(SEL)theAction - (BOOL)sendAction:(SEL)theAction
to:(id)theTarget; to:(id)theTarget;
- (int)sendActionOn:(int)mask; - (NSInteger)sendActionOn:(NSInteger)mask;
- (void)setAction:(SEL)aSelector; - (void)setAction:(SEL)aSelector;
- (void)setContinuous:(BOOL)flag; - (void)setContinuous:(BOOL)flag;
- (void)setTarget:(id)anObject; - (void)setTarget:(id)anObject;

4
Headers/AppKit/NSMatrix.h
View file

@ -193,8 +193,8 @@ typedef enum _NSMatrixMode {
- (BOOL) selectCellWithTag: (int)anInt; - (BOOL) selectCellWithTag: (int)anInt;
- (id) selectedCell; - (id) selectedCell;
- (NSArray *) selectedCells; - (NSArray *) selectedCells;
- (int) selectedColumn; - (NSInteger) selectedColumn;
- (int) selectedRow; - (NSInteger) selectedRow;
- (void) setSelectionFrom: (int)startPos - (void) setSelectionFrom: (int)startPos
to: (int)endPos to: (int)endPos
anchor: (int)anchorPos anchor: (int)anchorPos

99
Headers/AppKit/NSTableView.h
View file

@ -49,9 +49,10 @@ typedef enum _NSTableViewDropOperation {
} NSTableViewDropOperation; } NSTableViewDropOperation;
enum { enum {
NSTableViewGridNone = 0, NSTableViewGridNone = 0,
NSTableViewSolidVerticalGridLineMask = 1, NSTableViewSolidVerticalGridLineMask = 1 << 0,
NSTableViewSolidHorizontalGridLineMask = 2 NSTableViewSolidHorizontalGridLineMask = 1 << 1,
NSTableViewDashedHorizontalGridLineMask = 1 << 3
}; };
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
@ -65,6 +66,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
NSTableViewFirstColumnOnlyAutoresizingStyle NSTableViewFirstColumnOnlyAutoresizingStyle
} NSTableViewColumnAutoresizingStyle; } NSTableViewColumnAutoresizingStyle;
#endif #endif
typedef NSUInteger NSTableViewGridLineStyle;
@interface NSTableView : NSControl <NSUserInterfaceValidations> @interface NSTableView : NSControl <NSUserInterfaceValidations>
{ {
@ -157,8 +160,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/* Target-action */ /* Target-action */
- (void) setDoubleAction: (SEL)aSelector; - (void) setDoubleAction: (SEL)aSelector;
- (SEL) doubleAction; - (SEL) doubleAction;
- (int) clickedColumn; - (NSInteger) clickedColumn;
- (int) clickedRow; - (NSInteger) clickedRow;
/* Configuration */ /* Configuration */
- (void) setAllowsColumnReordering: (BOOL)flag; - (void) setAllowsColumnReordering: (BOOL)flag;
@ -187,34 +190,34 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/* Columns */ /* Columns */
- (void) addTableColumn: (NSTableColumn *)aColumn; - (void) addTableColumn: (NSTableColumn *)aColumn;
- (void) removeTableColumn: (NSTableColumn *)aColumn; - (void) removeTableColumn: (NSTableColumn *)aColumn;
- (void) moveColumn: (int)columnIndex toColumn: (int)newIndex; - (void) moveColumn: (NSInteger)columnIndex toColumn: (NSInteger)newIndex;
- (NSArray *) tableColumns; - (NSArray *) tableColumns;
- (int) columnWithIdentifier: (id)identifier; - (NSInteger) columnWithIdentifier: (id)identifier;
- (NSTableColumn *) tableColumnWithIdentifier: (id)anObject; - (NSTableColumn *) tableColumnWithIdentifier: (id)anObject;
/* Selecting Columns and Rows */ /* Selecting Columns and Rows */
- (void) selectColumn: (int) columnIndex byExtendingSelection: (BOOL)flag; - (void) selectColumn: (NSInteger) columnIndex byExtendingSelection: (BOOL)flag;
- (void) selectRow: (int) rowIndex byExtendingSelection: (BOOL)flag; - (void) selectRow: (NSInteger) rowIndex byExtendingSelection: (BOOL)flag;
- (void) selectColumnIndexes: (NSIndexSet *)indexes byExtendingSelection: (BOOL)extend; - (void) selectColumnIndexes: (NSIndexSet *)indexes byExtendingSelection: (BOOL)extend;
- (void) selectRowIndexes: (NSIndexSet *)indexes byExtendingSelection: (BOOL)extend; - (void) selectRowIndexes: (NSIndexSet *)indexes byExtendingSelection: (BOOL)extend;
- (NSIndexSet *) selectedColumnIndexes; - (NSIndexSet *) selectedColumnIndexes;
- (NSIndexSet *) selectedRowIndexes; - (NSIndexSet *) selectedRowIndexes;
- (void) deselectColumn: (int)columnIndex; - (void) deselectColumn: (NSInteger)columnIndex;
- (void) deselectRow: (int)rowIndex; - (void) deselectRow: (NSInteger)rowIndex;
- (int) numberOfSelectedColumns; - (NSInteger) numberOfSelectedColumns;
- (int) numberOfSelectedRows; - (NSInteger) numberOfSelectedRows;
- (int) selectedColumn; - (NSInteger) selectedColumn;
- (int) selectedRow; - (NSInteger) selectedRow;
- (BOOL) isColumnSelected: (int)columnIndex; - (BOOL) isColumnSelected: (NSInteger)columnIndex;
- (BOOL) isRowSelected: (int)rowIndex; - (BOOL) isRowSelected: (NSInteger)rowIndex;
- (NSEnumerator *) selectedColumnEnumerator; - (NSEnumerator *) selectedColumnEnumerator;
- (NSEnumerator *) selectedRowEnumerator; - (NSEnumerator *) selectedRowEnumerator;
- (void) selectAll: (id)sender; - (void) selectAll: (id)sender;
- (void) deselectAll: (id)sender; - (void) deselectAll: (id)sender;
/* Table Dimensions */ /* Table Dimensions */
- (int) numberOfColumns; - (NSInteger) numberOfColumns;
- (int) numberOfRows; - (NSInteger) numberOfRows;
/* Grid Drawing attributes */ /* Grid Drawing attributes */
- (void) setDrawsGrid: (BOOL)flag; - (void) setDrawsGrid: (BOOL)flag;
@ -222,18 +225,18 @@ typedef enum _NSTableViewColumnAutoresizingStyle
- (void) setGridColor: (NSColor *)aColor; - (void) setGridColor: (NSColor *)aColor;
- (NSColor *) gridColor; - (NSColor *) gridColor;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (void) setGridStyleMask: (unsigned int)gridType; - (void) setGridStyleMask: (NSTableViewGridLineStyle)gridType;
- (unsigned int) gridStyleMask; - (NSTableViewGridLineStyle) gridStyleMask;
#endif #endif
/* Editing Cells */ /* Editing Cells */
/* ALL TODOS */ /* ALL TODOS */
- (void) editColumn: (int)columnIndex - (void) editColumn: (NSInteger)columnIndex
row: (int)rowIndex row: (NSInteger)rowIndex
withEvent: (NSEvent *)theEvent withEvent: (NSEvent *)theEvent
select: (BOOL)flag; select: (BOOL)flag;
- (int) editedRow; - (NSInteger) editedRow;
- (int) editedColumn; - (NSInteger) editedColumn;
/* Auxiliary Components */ /* Auxiliary Components */
- (void) setHeaderView: (NSTableHeaderView*)aHeaderView; - (void) setHeaderView: (NSTableHeaderView*)aHeaderView;
@ -242,17 +245,17 @@ typedef enum _NSTableViewColumnAutoresizingStyle
- (NSView*) cornerView; - (NSView*) cornerView;
/* Layout */ /* Layout */
- (NSRect) rectOfColumn: (int)columnIndex; - (NSRect) rectOfColumn: (NSInteger)columnIndex;
- (NSRect) rectOfRow: (int)rowIndex; - (NSRect) rectOfRow: (NSInteger)rowIndex;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (NSIndexSet *) columnIndexesInRect: (NSRect)aRect; - (NSIndexSet *) columnIndexesInRect: (NSRect)aRect;
#endif #endif
- (NSRange) columnsInRect: (NSRect)aRect; - (NSRange) columnsInRect: (NSRect)aRect;
- (NSRange) rowsInRect: (NSRect)aRect; - (NSRange) rowsInRect: (NSRect)aRect;
- (int) columnAtPoint: (NSPoint)aPoint; - (NSInteger) columnAtPoint: (NSPoint)aPoint;
- (int) rowAtPoint: (NSPoint)aPoint; - (NSInteger) rowAtPoint: (NSPoint)aPoint;
- (NSRect) frameOfCellAtColumn: (int)columnIndex - (NSRect) frameOfCellAtColumn: (NSInteger)columnIndex
row: (int)rowIndex; row: (NSInteger)rowIndex;
- (void) setAutoresizesAllColumnsToFit: (BOOL)flag; - (void) setAutoresizesAllColumnsToFit: (BOOL)flag;
- (BOOL) autoresizesAllColumnsToFit; - (BOOL) autoresizesAllColumnsToFit;
- (void) sizeLastColumnToFit; - (void) sizeLastColumnToFit;
@ -265,7 +268,7 @@ typedef enum _NSTableViewColumnAutoresizingStyle
#endif #endif
/* Drawing */ /* Drawing */
- (void) drawRow: (int)rowIndex clipRect: (NSRect)clipRect; - (void) drawRow: (NSInteger)rowIndex clipRect: (NSRect)clipRect;
- (void) drawGridInClipRect: (NSRect)aRect; - (void) drawGridInClipRect: (NSRect)aRect;
- (void) highlightSelectionInClipRect: (NSRect)clipRect; - (void) highlightSelectionInClipRect: (NSRect)clipRect;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
@ -273,8 +276,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
#endif #endif
/* Scrolling */ /* Scrolling */
- (void) scrollRowToVisible: (int)rowIndex; - (void) scrollRowToVisible: (NSInteger)rowIndex;
- (void) scrollColumnToVisible: (int)columnIndex; - (void) scrollColumnToVisible: (NSInteger)columnIndex;
/* Text delegate methods */ /* Text delegate methods */
- (BOOL) textShouldBeginEditing: (NSText *)textObject; - (BOOL) textShouldBeginEditing: (NSText *)textObject;
@ -309,7 +312,7 @@ typedef enum _NSTableViewColumnAutoresizingStyle
- (NSImage*) dragImageForRows: (NSArray*)dragRows - (NSImage*) dragImageForRows: (NSArray*)dragRows
event: (NSEvent*)dragEvent event: (NSEvent*)dragEvent
dragImageOffset: (NSPoint*)dragImageOffset; dragImageOffset: (NSPoint*)dragImageOffset;
- (void) setDropRow: (int)row - (void) setDropRow: (NSInteger)row
dropOperation: (NSTableViewDropOperation)operation; dropOperation: (NSTableViewDropOperation)operation;
- (void) setVerticalMotionCanBeginDrag: (BOOL)flag; - (void) setVerticalMotionCanBeginDrag: (BOOL)flag;
- (BOOL) verticalMotionCanBeginDrag; - (BOOL) verticalMotionCanBeginDrag;
@ -333,8 +336,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
@end /* interface of NSTableView */ @end /* interface of NSTableView */
@interface NSTableView (GNUPrivate) @interface NSTableView (GNUPrivate)
- (void) _sendDoubleActionForColumn: (int)columnIndex; - (void) _sendDoubleActionForColumn: (NSInteger)columnIndex;
- (void) _selectColumn: (int)columnIndex - (void) _selectColumn: (NSInteger)columnIndex
modifiers: (unsigned int)modifiers; modifiers: (unsigned int)modifiers;
@end @end
@ -347,23 +350,23 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/** /**
* Returns the number of records that the data source manages for <em>aTableView</em>. * Returns the number of records that the data source manages for <em>aTableView</em>.
*/ */
- (int) numberOfRowsInTableView: (NSTableView *)aTableView; - (NSInteger) numberOfRowsInTableView: (NSTableView *)aTableView;
- (id) tableView: (NSTableView *)aTableView - (id) tableView: (NSTableView *)aTableView
objectValueForTableColumn: (NSTableColumn *)aTableColumn objectValueForTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex; row: (NSInteger)rowIndex;
- (void) tableView: (NSTableView *)aTableView - (void) tableView: (NSTableView *)aTableView
setObjectValue: (id)anObject setObjectValue: (id)anObject
forTableColumn: (NSTableColumn *)aTableColumn forTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex; row: (NSInteger)rowIndex;
/* Dragging */ /* Dragging */
- (BOOL) tableView: (NSTableView*)tableView - (BOOL) tableView: (NSTableView*)tableView
acceptDrop: (id <NSDraggingInfo>)info acceptDrop: (id <NSDraggingInfo>)info
row: (int)row row: (NSInteger)row
dropOperation: (NSTableViewDropOperation)operation; dropOperation: (NSTableViewDropOperation)operation;
- (NSDragOperation) tableView: (NSTableView*)tableView - (NSDragOperation) tableView: (NSTableView*)tableView
validateDrop: (id <NSDraggingInfo>)info validateDrop: (id <NSDraggingInfo>)info
proposedRow: (int)row proposedRow: (NSInteger)row
proposedDropOperation: (NSTableViewDropOperation)operation; proposedDropOperation: (NSTableViewDropOperation)operation;
- (BOOL) tableView: (NSTableView*)tableView - (BOOL) tableView: (NSTableView*)tableView
writeRows: (NSArray*)rows writeRows: (NSArray*)rows
@ -406,19 +409,19 @@ mouseDownInHeaderOfTableColumn: (NSTableColumn *)tableColumn;
#endif #endif
- (BOOL)tableView: (NSTableView *)aTableView - (BOOL)tableView: (NSTableView *)aTableView
shouldEditTableColumn: (NSTableColumn *)aTableColumn shouldEditTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex; row: (NSInteger)rowIndex;
- (BOOL) tableView: (NSTableView *)aTableView - (BOOL) tableView: (NSTableView *)aTableView
shouldSelectRow: (int)rowIndex; shouldSelectRow: (NSInteger)rowIndex;
- (BOOL) tableView: (NSTableView *)aTableView - (BOOL) tableView: (NSTableView *)aTableView
shouldSelectTableColumn: (NSTableColumn *)aTableColumn; shouldSelectTableColumn: (NSTableColumn *)aTableColumn;
- (void) tableView: (NSTableView *)aTableView - (void) tableView: (NSTableView *)aTableView
willDisplayCell: (id)aCell willDisplayCell: (id)aCell
forTableColumn: (NSTableColumn *)aTableColumn forTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex; row: (NSInteger)rowIndex;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (NSCell *) tableView: (NSTableView *)aTableView - (NSCell *) tableView: (NSTableView *)aTableView
dataCellForTableColumn: (NSTableColumn *)aTableColumn dataCellForTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex; row: (NSInteger)rowIndex;
#endif #endif
- (void) tableViewColumnDidMove: (NSNotification *)aNotification; - (void) tableViewColumnDidMove: (NSNotification *)aNotification;
- (void) tableViewColumnDidResize: (NSNotification *)aNotification; - (void) tableViewColumnDidResize: (NSNotification *)aNotification;
@ -426,12 +429,12 @@ dataCellForTableColumn: (NSTableColumn *)aTableColumn
- (void) tableViewSelectionIsChanging: (NSNotification *)aNotification; - (void) tableViewSelectionIsChanging: (NSNotification *)aNotification;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (float) tableView: (NSTableView *)tableView - (float) tableView: (NSTableView *)tableView
heightOfRow: (int)row; heightOfRow: (NSInteger)row;
- (NSString *) tableView: (NSTableView *)tableView - (NSString *) tableView: (NSTableView *)tableView
toolTipForCell: (NSCell *)cell toolTipForCell: (NSCell *)cell
rect: (NSRect *)rect rect: (NSRect *)rect
tableColumn: (NSTableColumn *)col tableColumn: (NSTableColumn *)col
row: (int)row row: (NSInteger)row
mouseLocation: (NSPoint)mouse; mouseLocation: (NSPoint)mouse;
#endif #endif
@end @end

2
Headers/AppKit/NSToolbar.h
View file

@ -74,7 +74,7 @@ APPKIT_EXPORT NSString *NSToolbarWillAddItemNotification;
@interface NSToolbar : NSObject @interface NSToolbar : NSObject
{ {
NSMutableDictionary *_configurationDictionary; NSDictionary *_configurationDictionary;
id _delegate; id _delegate;
NSString *_identifier; NSString *_identifier;
NSString *_selectedItemIdentifier; NSString *_selectedItemIdentifier;

2
Source/GSDisplayServer.m
View file

@ -819,7 +819,7 @@ GSCurrentServer(void)
} }
/** Sets the transparancy value for the whole window */ /** Sets the transparancy value for the whole window */
- (void) setalpha: (float)alpha: (int) win - (void) setalpha: (float)alpha : (int) win
{ {
//[self subclassResponsibility: _cmd]; //[self subclassResponsibility: _cmd];
} }

2
Source/GSDragView.m
View file

@ -108,7 +108,7 @@
[self setExcludedFromWindowsMenu: YES]; [self setExcludedFromWindowsMenu: YES];
} }
- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (int)otherWin - (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (NSInteger)otherWin
{ {
[super orderWindow: place relativeTo: otherWin]; [super orderWindow: place relativeTo: otherWin];
[self setLevel: NSPopUpMenuWindowLevel]; [self setLevel: NSPopUpMenuWindowLevel];

2
Source/GSLayoutManager.m
View file

@ -3208,7 +3208,7 @@ forStartingGlyphAtIndex: (NSUInteger)glyph
len = glyph - gpos + length; len = glyph - gpos + length;
if (len < 0) if (len < 0)
{ {
NSLog(@"Insert %d glyphs at %d for index %d", length, glyph, index); NSLog(@"Insert %d glyphs at %d for index %d", (int)length, (int)glyph, (int)index);
NSLog(@"Found gpos %d cpos %d len %d", gpos, cpos, len); NSLog(@"Found gpos %d cpos %d len %d", gpos, cpos, len);
[NSException raise: NSRangeException [NSException raise: NSRangeException
format: @"%s glyph index out of range", __PRETTY_FUNCTION__]; format: @"%s glyph index out of range", __PRETTY_FUNCTION__];

4
Source/GSMemoryPanel.m
View file

@ -310,14 +310,14 @@ static GSMemoryPanel *sharedGSMemoryPanel = nil;
[super dealloc]; [super dealloc];
} }
- (int) numberOfRowsInTableView: (NSTableView *)aTableView - (NSInteger) numberOfRowsInTableView: (NSTableView *)aTableView
{ {
return [array count]; return [array count];
} }
- (id) tableView: (NSTableView *)aTableView - (id) tableView: (NSTableView *)aTableView
objectValueForTableColumn: (NSTableColumn *)aTableColumn objectValueForTableColumn: (NSTableColumn *)aTableColumn
row:(int)rowIndex row:(NSInteger)rowIndex
{ {
GSMemoryPanelEntry *entry = [array objectAtIndex: rowIndex]; GSMemoryPanelEntry *entry = [array objectAtIndex: rowIndex];
id identifier = [aTableColumn identifier]; id identifier = [aTableColumn identifier];

4
Source/GSNibLoading.m
View file

@ -1184,7 +1184,7 @@ static BOOL _isInInterfaceBuilder = NO;
NSStringFromClass([coder class])]; NSStringFromClass([coder class])];
} }
return _view; return (id)_view;
} }
- (void) encodeWithCoder: (NSCoder *)coder - (void) encodeWithCoder: (NSCoder *)coder
@ -2342,7 +2342,7 @@ static BOOL _isInInterfaceBuilder = NO;
} }
RELEASE(self); RELEASE(self);
return dn; return (id)dn;
} }
@end @end

2
Source/GSTheme.m
View file

@ -690,7 +690,7 @@ typedef struct {
colorsPath = [_bundle pathForResource: @"ThemeColors" ofType: @"clr"]; colorsPath = [_bundle pathForResource: @"ThemeColors" ofType: @"clr"];
if (colorsPath == nil) if (colorsPath == nil)
{ {
_colors = [null retain]; _colors = (id)[null retain];
} }
else else
{ {

2
Source/GSToolTips.m
View file

@ -143,7 +143,7 @@
} }
} }
- (void) drawRect: (id)dirtyRect - (void) drawRect: (NSRect)dirtyRect
{ {
if (_text) if (_text)
{ {

2
Source/GSXibLoader.m
View file

@ -1095,7 +1095,7 @@
if ([xmlKeys count] != [xmlObjs count]) if ([xmlKeys count] != [xmlObjs count])
{ {
NSLog(@"%s:keys to objs count mismatch - keys: %d objs: %d\n", __PRETTY_FUNCTION__, NSLog(@"%s:keys to objs count mismatch - keys: %d objs: %d\n", __PRETTY_FUNCTION__,
[xmlKeys count], [xmlObjs count]); (int)[xmlKeys count], (int)[xmlObjs count]);
} }
else else
{ {

4
Source/NSActionCell.m
View file

@ -105,8 +105,8 @@ static Class controlClass;
} }
- (void) setFloatingPointFormat: (BOOL)autoRange - (void) setFloatingPointFormat: (BOOL)autoRange
left: (unsigned int)leftDigits left: (NSUInteger)leftDigits
right: (unsigned int)rightDigits right: (NSUInteger)rightDigits
{ {
[super setFloatingPointFormat: autoRange [super setFloatingPointFormat: autoRange
left: leftDigits left: leftDigits

12
Source/NSAlert.m
View file

@ -1897,7 +1897,7 @@ void NSBeginInformationalAlertSheet(NSString *title,
- (NSButton *) addButtonWithTitle: (NSString *)aTitle - (NSButton *) addButtonWithTitle: (NSString *)aTitle
{ {
NSButton *button = [[NSButton alloc] init]; NSButton *button = [[NSButton alloc] init];
int count = [_buttons count]; NSUInteger count = [_buttons count];
[button setTitle: aTitle]; [button setTitle: aTitle];
[button setAutoresizingMask: NSViewMinXMargin | NSViewMaxYMargin]; [button setAutoresizingMask: NSViewMinXMargin | NSViewMaxYMargin];
@ -2172,8 +2172,8 @@ NSInteger GSRunExceptionPanel(
[_userInfoPanel makeKeyAndOrderFront: self]; [_userInfoPanel makeKeyAndOrderFront: self];
} }
- (int) browser: (id)browser - (NSInteger) browser: (id)browser
numberOfRowsInColumn: (int)col numberOfRowsInColumn: (NSInteger)col
{ {
if (col == 0) if (col == 0)
return [[_userInfo allKeys] count]; return [[_userInfo allKeys] count];
@ -2201,8 +2201,8 @@ numberOfRowsInColumn: (int)col
- (void) browser: (NSBrowser *)browser - (void) browser: (NSBrowser *)browser
willDisplayCell: (NSBrowserCell *)cell willDisplayCell: (NSBrowserCell *)cell
atRow: (int)row atRow: (NSInteger)row
column: (int)column column: (NSInteger)column
{ {
if (column == 0) if (column == 0)
{ {
@ -2295,7 +2295,7 @@ numberOfRowsInColumn: (int)col
} }
} }
- (id) browser: (NSBrowser *)browser titleOfColumn: (int)column - (id) browser: (NSBrowser *)browser titleOfColumn: (NSInteger)column
{ {
id val; id val;
NSString *title; NSString *title;

2
Source/NSApplication.m
View file

@ -343,7 +343,7 @@ gsapp_user_bundles(void)
c = [a count]; c = [a count];
if (a == nil || c == 0) if (a == nil || c == 0)
return; return;
NSLog(@"Loading %d user defined AppKit bundles", c); NSLog(@"Loading %d user defined AppKit bundles", (int)c);
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
{ {
NSBundle *b = [NSBundle bundleWithPath: [a objectAtIndex: i]]; NSBundle *b = [NSBundle bundleWithPath: [a objectAtIndex: i]];

92
Source/NSBrowser.m
View file

@ -326,7 +326,7 @@ static NSTextFieldCell *titleCell;
Returns nil if no cell is selected</p> Returns nil if no cell is selected</p>
<p>See Also: -selectedCell -selectedCells</p> <p>See Also: -selectedCell -selectedCells</p>
*/ */
- (id) selectedCellInColumn: (int)column - (id) selectedCellInColumn: (NSInteger)column
{ {
NSMatrix *matrix; NSMatrix *matrix;
@ -380,7 +380,7 @@ static NSTextFieldCell *titleCell;
index <var>column</var>. Returns -1 if no cell is selected</p> index <var>column</var>. Returns -1 if no cell is selected</p>
<p>See Also: -selectedCellInColumn: [NSMatrix-selectedRow]</p> <p>See Also: -selectedCellInColumn: [NSMatrix-selectedRow]</p>
*/ */
- (int) selectedRowInColumn: (int)column - (NSInteger) selectedRowInColumn: (NSInteger)column
{ {
NSMatrix *matrix; NSMatrix *matrix;
@ -400,7 +400,7 @@ static NSTextFieldCell *titleCell;
selection.</p><p>See Also: -loadedCellAtRow:column: selection.</p><p>See Also: -loadedCellAtRow:column:
-browser:selectRow:inColumn: [NSMatrix-selectCellAtRow:column:]</p> -browser:selectRow:inColumn: [NSMatrix-selectCellAtRow:column:]</p>
*/ */
- (void) selectRow: (int)row inColumn: (int)column - (void) selectRow: (NSInteger)row inColumn: (NSInteger)column
{ {
NSMatrix *matrix; NSMatrix *matrix;
id cell; id cell;
@ -447,8 +447,8 @@ static NSTextFieldCell *titleCell;
if you change this code, you may want to look at the __performLoadOfColumn: if you change this code, you may want to look at the __performLoadOfColumn:
method in which the following code is integrated (for speed) method in which the following code is integrated (for speed)
*/ */
- (id) loadedCellAtRow: (int)row - (id) loadedCellAtRow: (NSInteger)row
column: (int)column column: (NSInteger)column
{ {
NSMatrix *matrix; NSMatrix *matrix;
NSCell *cell; NSCell *cell;
@ -487,7 +487,7 @@ static NSTextFieldCell *titleCell;
/** <p>Returns the matrix located in the column identified by index /** <p>Returns the matrix located in the column identified by index
<var>column</var>. Returns nil if the matrix does not exists</p> <var>column</var>. Returns nil if the matrix does not exists</p>
*/ */
- (NSMatrix *) matrixInColumn: (int)column - (NSMatrix *) matrixInColumn: (NSInteger)column
{ {
NSBrowserColumn *browserColumn; NSBrowserColumn *browserColumn;
@ -555,7 +555,7 @@ static NSTextFieldCell *titleCell;
NSMutableArray *subStrings; NSMutableArray *subStrings;
unsigned numberOfSubStrings; unsigned numberOfSubStrings;
unsigned indexOfSubStrings; unsigned indexOfSubStrings;
int column; NSInteger column;
BOOL useDelegate = NO; BOOL useDelegate = NO;
if ([_browserDelegate respondsToSelector: if ([_browserDelegate respondsToSelector:
@ -639,8 +639,8 @@ static NSTextFieldCell *titleCell;
} }
else else
{ {
int numOfRows = [matrix numberOfRows]; NSInteger numOfRows = [matrix numberOfRows];
int row; NSInteger row;
// find the cell in the browser matrix which is equal to aStr // find the cell in the browser matrix which is equal to aStr
for (row = 0; row < numOfRows; row++) for (row = 0; row < numOfRows; row++)
@ -665,7 +665,7 @@ static NSTextFieldCell *titleCell;
// if unable to find a cell whose title matches aStr return NO // if unable to find a cell whose title matches aStr return NO
NSDebugLLog (@"NSBrowser", NSDebugLLog (@"NSBrowser",
@"unable to find cell '%@' in column %d\n", @"unable to find cell '%@' in column %d\n",
aStr, column); aStr, (int)column);
break; break;
} }
@ -696,11 +696,11 @@ static NSTextFieldCell *titleCell;
/** <p>Returns a string representing the path from the first column up to, /** <p>Returns a string representing the path from the first column up to,
but not including, the column at index column.</p> but not including, the column at index column.</p>
<p>See Also: -path</p>*/ <p>See Also: -path</p>*/
- (NSString *) pathToColumn: (int)column - (NSString *) pathToColumn: (NSInteger)column
{ {
NSMutableString *separator = [_pathSeparator mutableCopy]; NSMutableString *separator = [_pathSeparator mutableCopy];
NSString *string; NSString *string;
int i; NSInteger i;
/* /*
* Cannot go past the number of loaded columns * Cannot go past the number of loaded columns
@ -835,7 +835,7 @@ static NSTextFieldCell *titleCell;
- (BOOL) becomeFirstResponder - (BOOL) becomeFirstResponder
{ {
NSMatrix *matrix; NSMatrix *matrix;
int selectedColumn; NSInteger selectedColumn;
selectedColumn = [self selectedColumn]; selectedColumn = [self selectedColumn];
if (selectedColumn == -1) if (selectedColumn == -1)
@ -860,7 +860,7 @@ static NSTextFieldCell *titleCell;
/** <p>Updates the NSBrowser to display the column with the given index.</p> /** <p>Updates the NSBrowser to display the column with the given index.</p>
*/ */
- (void) displayColumn: (int)column - (void) displayColumn: (NSInteger)column
{ {
NSBrowserColumn *bc; NSBrowserColumn *bc;
NSScrollView *sc; NSScrollView *sc;
@ -894,7 +894,7 @@ static NSTextFieldCell *titleCell;
/** <p>Returns the column number in which <var>matrix</var> is located. /** <p>Returns the column number in which <var>matrix</var> is located.
Returns -1 if <var>matrix</var> is not found.</p> Returns -1 if <var>matrix</var> is not found.</p>
*/ */
- (int) columnOfMatrix: (NSMatrix *)matrix - (NSInteger) columnOfMatrix: (NSMatrix *)matrix
{ {
int i, count; int i, count;
@ -911,7 +911,7 @@ static NSTextFieldCell *titleCell;
} }
/** Returns the index of the last column with a selected item. */ /** Returns the index of the last column with a selected item. */
- (int) selectedColumn - (NSInteger) selectedColumn
{ {
int i; int i;
NSMatrix *matrix; NSMatrix *matrix;
@ -930,7 +930,7 @@ static NSTextFieldCell *titleCell;
/** <p>Returns the index of the last column loaded.</p> /** <p>Returns the index of the last column loaded.</p>
<p>See Also: -setLastColumn:</p> <p>See Also: -setLastColumn:</p>
*/ */
- (int) lastColumn - (NSInteger) lastColumn
{ {
return _lastColumnLoaded; return _lastColumnLoaded;
} }
@ -938,7 +938,7 @@ static NSTextFieldCell *titleCell;
/** <p>Sets the last column to <var>column</var>.</p> /** <p>Sets the last column to <var>column</var>.</p>
<p>See Also: -lastColumn </p> <p>See Also: -lastColumn </p>
*/ */
- (void) setLastColumn: (int)column - (void) setLastColumn: (NSInteger)column
{ {
int i, count; int i, count;
NSBrowserColumn *bc; NSBrowserColumn *bc;
@ -989,16 +989,16 @@ static NSTextFieldCell *titleCell;
} }
/** Returns the index of the first visible column. */ /** Returns the index of the first visible column. */
- (int) firstVisibleColumn - (NSInteger) firstVisibleColumn
{ {
return _firstVisibleColumn; return _firstVisibleColumn;
} }
/** <p>Returns the number of columns visible.</p> /** <p>Returns the number of columns visible.</p>
<p>See Also: -firstVisibleColumn -lastVisibleColumn</p>*/ <p>See Also: -firstVisibleColumn -lastVisibleColumn</p>*/
- (int) numberOfVisibleColumns - (NSInteger) numberOfVisibleColumns
{ {
int num; NSInteger num;
num = _lastVisibleColumn - _firstVisibleColumn + 1; num = _lastVisibleColumn - _firstVisibleColumn + 1;
@ -1006,7 +1006,7 @@ static NSTextFieldCell *titleCell;
} }
/** Returns the index of the last visible column. */ /** Returns the index of the last visible column. */
- (int) lastVisibleColumn - (NSInteger) lastVisibleColumn
{ {
return _lastVisibleColumn; return _lastVisibleColumn;
} }
@ -1062,7 +1062,7 @@ static NSTextFieldCell *titleCell;
/** Reloads column if it is loaded; sets it as the last column. /** Reloads column if it is loaded; sets it as the last column.
Reselects previously selected cells, if they remain. */ Reselects previously selected cells, if they remain. */
- (void) reloadColumn: (int)column - (void) reloadColumn: (NSInteger)column
{ {
NSArray *selectedCells; NSArray *selectedCells;
NSEnumerator *selectedCellsEnumerator; NSEnumerator *selectedCellsEnumerator;
@ -1206,7 +1206,7 @@ static NSTextFieldCell *titleCell;
/**<p>Returns the maximum number of visible columns. By default a NSBrowser /**<p>Returns the maximum number of visible columns. By default a NSBrowser
has 3 visible columns.</p><p>See Also: -setMaxVisibleColumns:</p> has 3 visible columns.</p><p>See Also: -setMaxVisibleColumns:</p>
*/ */
- (int) maxVisibleColumns - (NSInteger) maxVisibleColumns
{ {
return _maxVisibleColumns; return _maxVisibleColumns;
} }
@ -1215,7 +1215,7 @@ static NSTextFieldCell *titleCell;
subviews. By default a NSBrowser has 3 visible columns.</p> subviews. By default a NSBrowser has 3 visible columns.</p>
<p>See Also: -maxVisibleColumns</p> <p>See Also: -maxVisibleColumns</p>
*/ */
- (void) setMaxVisibleColumns: (int)columnCount - (void) setMaxVisibleColumns: (NSInteger)columnCount
{ {
if ((columnCount < 1) || (_maxVisibleColumns == columnCount)) if ((columnCount < 1) || (_maxVisibleColumns == columnCount))
return; return;
@ -1229,7 +1229,7 @@ static NSTextFieldCell *titleCell;
/** <p>Returns the minimum column width in pixels.</p> /** <p>Returns the minimum column width in pixels.</p>
<p>See Also: -setMinColumnWidth:</p> <p>See Also: -setMinColumnWidth:</p>
*/ */
- (int) minColumnWidth - (NSInteger) minColumnWidth
{ {
return _minColumnWidth; return _minColumnWidth;
} }
@ -1237,7 +1237,7 @@ static NSTextFieldCell *titleCell;
/** <p>Sets the minimum column width in pixels and adjusts subviews.</p> /** <p>Sets the minimum column width in pixels and adjusts subviews.</p>
<p>See Also: -minColumnWidth</p> <p>See Also: -minColumnWidth</p>
*/ */
- (void) setMinColumnWidth: (int)columnWidth - (void) setMinColumnWidth: (NSInteger)columnWidth
{ {
float sw; float sw;
@ -1272,7 +1272,7 @@ static NSTextFieldCell *titleCell;
NSBrowserColumn *bc; NSBrowserColumn *bc;
NSScrollView *sc; NSScrollView *sc;
NSBorderType bt; NSBorderType bt;
int i, columnCount; NSInteger i, columnCount;
// if this flag already set or browser is titled -- do nothing // if this flag already set or browser is titled -- do nothing
if (_separatesColumns == flag || _isTitled) if (_separatesColumns == flag || _isTitled)
@ -1341,7 +1341,7 @@ static NSTextFieldCell *titleCell;
_prefersAllColumnUserResizing = flag; _prefersAllColumnUserResizing = flag;
} }
- (float) widthOfColumn: (int)column - (float) widthOfColumn: (NSInteger)column
{ {
NSBrowserColumn *browserColumn; NSBrowserColumn *browserColumn;
@ -1350,7 +1350,7 @@ static NSTextFieldCell *titleCell;
return browserColumn->_width; return browserColumn->_width;
} }
- (void) setWidth: (float)columnWidth ofColumn: (int)columnIndex - (void) setWidth: (float)columnWidth ofColumn: (NSInteger)columnIndex
{ {
NSBrowserColumn *browserColumn; NSBrowserColumn *browserColumn;
@ -1391,7 +1391,7 @@ static NSTextFieldCell *titleCell;
/** Returns the title displayed for the column at index column. /** Returns the title displayed for the column at index column.
*/ */
- (NSString *) titleOfColumn: (int)column - (NSString *) titleOfColumn: (NSInteger)column
{ {
NSBrowserColumn *browserColumn; NSBrowserColumn *browserColumn;
@ -1406,7 +1406,7 @@ static NSTextFieldCell *titleCell;
<p>See Also: -isTitled -titleFrameOfColumn: -titleHeight</p> <p>See Also: -isTitled -titleFrameOfColumn: -titleHeight</p>
*/ */
- (void) setTitle: (NSString *)aString - (void) setTitle: (NSString *)aString
ofColumn: (int)column ofColumn: (NSInteger)column
{ {
NSBrowserColumn *bc; NSBrowserColumn *bc;
@ -1446,7 +1446,7 @@ static NSTextFieldCell *titleCell;
/** /**
*/ */
- (void) drawTitleOfColumn: (int)column - (void) drawTitleOfColumn: (NSInteger)column
inRect: (NSRect)aRect inRect: (NSRect)aRect
{ {
[self drawTitle: [self titleOfColumn: column] [self drawTitle: [self titleOfColumn: column]
@ -1458,7 +1458,7 @@ static NSTextFieldCell *titleCell;
defined by aRect. */ defined by aRect. */
- (void) drawTitle: (NSString *)title - (void) drawTitle: (NSString *)title
inRect: (NSRect)aRect inRect: (NSRect)aRect
ofColumn: (int)column ofColumn: (NSInteger)column
{ {
if (!_isTitled || !NSBR_COLUMN_IS_VISIBLE(column)) if (!_isTitled || !NSBR_COLUMN_IS_VISIBLE(column))
return; return;
@ -1481,7 +1481,7 @@ static NSTextFieldCell *titleCell;
Returns NSZeroRect if the NSBrowser does not display its titles</p> Returns NSZeroRect if the NSBrowser does not display its titles</p>
<p>See Also: -isTitled</p> <p>See Also: -isTitled</p>
*/ */
- (NSRect) titleFrameOfColumn: (int)column - (NSRect) titleFrameOfColumn: (NSInteger)column
{ {
// Not titled then no frame // Not titled then no frame
if (!_isTitled) if (!_isTitled)
@ -1491,8 +1491,8 @@ static NSTextFieldCell *titleCell;
else else
{ {
// Number of columns over from the first // Number of columns over from the first
int nbColumn = column - _firstVisibleColumn; NSInteger nbColumn = column - _firstVisibleColumn;
int titleHeight = [self titleHeight]; NSInteger titleHeight = [self titleHeight];
NSRect rect; NSRect rect;
// Calculate origin // Calculate origin
@ -1531,7 +1531,7 @@ static NSTextFieldCell *titleCell;
/** <p>Scrolls to make the column at index <var>column</var> visible.</p> /** <p>Scrolls to make the column at index <var>column</var> visible.</p>
<p>See Also: -scrollColumnsRightBy: -scrollColumnsLeftBy:</p> <p>See Also: -scrollColumnsRightBy: -scrollColumnsLeftBy:</p>
*/ */
- (void) scrollColumnToVisible: (int)column - (void) scrollColumnToVisible: (NSInteger)column
{ {
// If its the last visible column then we are there already // If its the last visible column then we are there already
if (_lastVisibleColumn < column) if (_lastVisibleColumn < column)
@ -1547,7 +1547,7 @@ static NSTextFieldCell *titleCell;
/** <p>Scrolls columns left by <var>shiftAmount</var> columns.</p> /** <p>Scrolls columns left by <var>shiftAmount</var> columns.</p>
<p>See Also: -scrollColumnsRightBy: -scrollColumnToVisible:</p> <p>See Also: -scrollColumnsRightBy: -scrollColumnToVisible:</p>
*/ */
- (void) scrollColumnsLeftBy: (int)shiftAmount - (void) scrollColumnsLeftBy: (NSInteger)shiftAmount
{ {
// Cannot shift past the zero column // Cannot shift past the zero column
if ((_firstVisibleColumn - shiftAmount) < 0) if ((_firstVisibleColumn - shiftAmount) < 0)
@ -1581,7 +1581,7 @@ static NSTextFieldCell *titleCell;
/** <p>Scrolls columns right by <var>shiftAmount</var> columns.</p> /** <p>Scrolls columns right by <var>shiftAmount</var> columns.</p>
<p>See Also: -scrollColumnsLeftBy: -scrollColumnToVisible:</p> <p>See Also: -scrollColumnsLeftBy: -scrollColumnToVisible:</p>
*/ */
- (void) scrollColumnsRightBy: (int)shiftAmount - (void) scrollColumnsRightBy: (NSInteger)shiftAmount
{ {
// Cannot shift past the last loaded column // Cannot shift past the last loaded column
if ((shiftAmount + _lastVisibleColumn) > _lastColumnLoaded) if ((shiftAmount + _lastVisibleColumn) > _lastColumnLoaded)
@ -1616,9 +1616,9 @@ static NSTextFieldCell *titleCell;
*/ */
- (void) updateScroller - (void) updateScroller
{ {
int num = [self numberOfVisibleColumns]; NSInteger num = [self numberOfVisibleColumns];
float prop = (float)num / (float)(_lastColumnLoaded + 1); float prop = (float)num / (float)(_lastColumnLoaded + 1);
int uc = ((_lastColumnLoaded + 1) - num); // Unvisible columns NSInteger uc = ((_lastColumnLoaded + 1) - num); // Unvisible columns
float f_step = 1.0; // Knob moving step float f_step = 1.0; // Knob moving step
float fv = 0.0; float fv = 0.0;
@ -1765,11 +1765,11 @@ static NSTextFieldCell *titleCell;
*/ */
/** <p>Returns the rectangle containing the column at index column.</p> */ /** <p>Returns the rectangle containing the column at index column.</p> */
- (NSRect) frameOfColumn: (int)column - (NSRect) frameOfColumn: (NSInteger)column
{ {
NSRect rect = NSZeroRect; NSRect rect = NSZeroRect;
NSSize bezelBorderSize = [[GSTheme theme] sizeForBorderType: NSBezelBorder]; NSSize bezelBorderSize = [[GSTheme theme] sizeForBorderType: NSBezelBorder];
int n; NSInteger n;
// Number of columns over from the first // Number of columns over from the first
n = column - _firstVisibleColumn; n = column - _firstVisibleColumn;
@ -1828,7 +1828,7 @@ static NSTextFieldCell *titleCell;
/** Returns the rectangle containing the column at index column, */ /** Returns the rectangle containing the column at index column, */
// not including borders. // not including borders.
- (NSRect) frameOfInsideOfColumn: (int)column - (NSRect) frameOfInsideOfColumn: (NSInteger)column
{ {
// xxx what does this one do? // xxx what does this one do?
return [self frameOfColumn: column]; return [self frameOfColumn: column];
@ -1862,7 +1862,7 @@ static NSTextFieldCell *titleCell;
- (void) tile - (void) tile
{ {
NSSize bezelBorderSize = [[GSTheme theme] sizeForBorderType: NSBezelBorder]; NSSize bezelBorderSize = [[GSTheme theme] sizeForBorderType: NSBezelBorder];
int i, num, columnCount, delta; NSInteger i, num, columnCount, delta;
float frameWidth; float frameWidth;
_columnSize.height = _frame.size.height; _columnSize.height = _frame.size.height;

6
Source/NSButtonCell.m
View file

@ -238,9 +238,9 @@ typedef struct _GSButtonCellFlags
} }
} }
- (int) cellAttribute: (NSCellAttribute)aParameter - (NSInteger) cellAttribute: (NSCellAttribute)aParameter
{ {
int value = 0; NSInteger value = 0;
switch (aParameter) switch (aParameter)
{ {
@ -280,7 +280,7 @@ typedef struct _GSButtonCellFlags
return value; return value;
} }
- (void) setCellAttribute: (NSCellAttribute)aParameter to: (int)value - (void) setCellAttribute: (NSCellAttribute)aParameter to: (NSInteger)value
{ {
switch (aParameter) switch (aParameter)
{ {

4
Source/NSCell.m
View file

@ -539,7 +539,7 @@ static NSColor *dtxtCol;
} }
default: default:
{ {
NSWarnLog (@"cell attribute %d not supported", aParameter); NSWarnLog (@"cell attribute %d not supported", (int)aParameter);
break; break;
} }
} }
@ -659,7 +659,7 @@ static NSColor *dtxtCol;
} }
default: default:
{ {
NSWarnLog (@"cell attribute %d not supported", aParameter); NSWarnLog (@"cell attribute %d not supported", (int)aParameter);
break; break;
} }
} }

2
Source/NSColor.m
View file

@ -1891,7 +1891,7 @@ static NSRecursiveLock *namedColorLock = nil;
else else
{ {
[self release]; [self release];
self = [c retain]; self = (GSNamedColor*)[c retain];
} }
[namedColorLock unlock]; [namedColorLock unlock];
return self; return self;

2
Source/NSColorList.m
View file

@ -86,7 +86,7 @@ static NSColorList *themeColorList = nil;
if (self == [NSColorList class]) if (self == [NSColorList class])
{ {
[self setVersion: 2]; [self setVersion: 2];
_colorListLock = [NSRecursiveLock new]; _colorListLock = (NSLock *)[NSRecursiveLock new];
} }
} }

18
Source/NSComboBoxCell.m
View file

@ -126,7 +126,7 @@ static GSComboWindow *gsWindow = nil;
} }
- (id) initWithContentRect: (NSRect)contentRect - (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle styleMask: (NSUInteger)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag defer: (BOOL)flag
{ {
@ -507,7 +507,7 @@ static GSComboWindow *gsWindow = nil;
} }
// Browser delegate methods // Browser delegate methods
- (int) browser: (NSBrowser *)sender numberOfRowsInColumn: (int)column - (NSInteger) browser: (NSBrowser *)sender numberOfRowsInColumn: (NSInteger)column
{ {
if (_cell == nil) if (_cell == nil)
return 0; return 0;
@ -517,8 +517,8 @@ static GSComboWindow *gsWindow = nil;
- (void) browser: (NSBrowser *)sender - (void) browser: (NSBrowser *)sender
willDisplayCell: (id)aCell willDisplayCell: (id)aCell
atRow: (int)row atRow: (NSInteger)row
column: (int)column column: (NSInteger)column
{ {
if (_cell == nil) if (_cell == nil)
return; return;
@ -528,12 +528,12 @@ static GSComboWindow *gsWindow = nil;
} }
// Table view data source methods // Table view data source methods
- (int) numberOfRowsInTableView: (NSTableView *)tv - (NSInteger) numberOfRowsInTableView: (NSTableView *)tv
{ {
return [_cell numberOfItems]; return [_cell numberOfItems];
} }
- (id) tableView: (NSTableView *)tv objectValueForTableColumn: (NSTableColumn *)tc row: (int)row - (id) tableView: (NSTableView *)tv objectValueForTableColumn: (NSTableColumn *)tc row: (NSInteger)row
{ {
return [_cell _stringValueAtIndex: row]; return [_cell _stringValueAtIndex: row];
} }
@ -551,7 +551,7 @@ static GSComboWindow *gsWindow = nil;
// Key actions methods // Key actions methods
- (void) moveUpSelection - (void) moveUpSelection
{ {
int index = [_tableView selectedRow] - 1; NSInteger index = [_tableView selectedRow] - 1;
if (index > -1 && index < [_tableView numberOfRows]) if (index > -1 && index < [_tableView numberOfRows])
{ {
@ -1666,8 +1666,8 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
inView: (NSView *)controlView inView: (NSView *)controlView
editor: (NSText *)textObj editor: (NSText *)textObj
delegate: (id)anObject delegate: (id)anObject
start: (int)selStart start: (NSInteger)selStart
length: (int)selLength length: (NSInteger)selLength
{ {
[super selectWithFrame: textCellFrameFromRect(aRect) [super selectWithFrame: textCellFrameFromRect(aRect)
inView: controlView inView: controlView

8
Source/NSControl.m
View file

@ -474,8 +474,8 @@ static NSNotificationCenter *nc;
} }
- (void) setFloatingPointFormat: (BOOL)autoRange - (void) setFloatingPointFormat: (BOOL)autoRange
left: (unsigned)leftDigits left: (NSUInteger)leftDigits
right: (unsigned)rightDigits right: (NSUInteger)rightDigits
{ {
[self abortEditing]; [self abortEditing];
@ -762,7 +762,7 @@ static NSNotificationCenter *nc;
return NO; return NO;
} }
- (int) sendActionOn: (int)mask - (NSInteger) sendActionOn: (NSInteger)mask
{ {
return [_cell sendActionOn: mask]; return [_cell sendActionOn: mask];
} }
@ -971,7 +971,7 @@ static NSNotificationCenter *nc;
the NSCell-trackMouse:inRect:ofView:untilMouseUp: method.</p> the NSCell-trackMouse:inRect:ofView:untilMouseUp: method.</p>
<p>This is a NeXTStep 3.3 method, no longer officially supported.</p> <p>This is a NeXTStep 3.3 method, no longer officially supported.</p>
*/ */
- (int) mouseDownFlags - (NSInteger) mouseDownFlags
{ {
return [[self selectedCell] mouseDownFlags]; return [[self selectedCell] mouseDownFlags];
} }

2
Source/NSEvent.m
View file

@ -790,7 +790,7 @@ static const char *eventTypes[] = {
if (version == 1) if (version == 1)
{ {
// For the unlikely case that old events have been stored, convert them. // For the unlikely case that old events have been stored, convert them.
switch (event_type) switch ((int)event_type)
{ {
case 0: event_type = NSLeftMouseDown; break; case 0: event_type = NSLeftMouseDown; break;
case 1: event_type = NSLeftMouseUp; break; case 1: event_type = NSLeftMouseUp; break;

2
Source/NSFontPanel.m
View file

@ -266,7 +266,7 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
{ {
[familyBrowser selectRow: i inColumn: 0]; [familyBrowser selectRow: i inColumn: 0];
_family = i; _family = i;
ASSIGN(_faceList, [fm availableMembersOfFontFamily: family]); ASSIGN(_faceList, (NSMutableArray *)[fm availableMembersOfFontFamily: family]);
[faceBrowser loadColumnZero]; [faceBrowser loadColumnZero];
_face = -1; _face = -1;
} }

2
Source/NSGraphicsContext.m
View file

@ -1591,7 +1591,7 @@ destination point but not the content. */
/** Generic method to draw an image into a rect. The image is defined /** Generic method to draw an image into a rect. The image is defined
by imageref, an opaque structure. Support for this method hasn't by imageref, an opaque structure. Support for this method hasn't
been implemented yet, so it should not be used anywhere. */ been implemented yet, so it should not be used anywhere. */
- (void) GSDrawImage: (NSRect)rect: (void *)imageref - (void) GSDrawImage: (NSRect)rect : (void *)imageref
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }

2
Source/NSHelpManager.m
View file

@ -152,7 +152,7 @@
if (helpFile) if (helpFile)
{ {
NSString *helpstr; NSAttributedString *helpstr;
helpstr = [[NSAttributedString alloc] initWithPath: helpFile helpstr = [[NSAttributedString alloc] initWithPath: helpFile
documentAttributes: NULL]; documentAttributes: NULL];

2
Source/NSHelpPanel.m
View file

@ -130,7 +130,7 @@ static NSHelpPanel *_sharedPanel = nil;
} }
- (id) initWithContentRect: (NSRect)contentRect - (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle styleMask: (NSUInteger)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag defer: (BOOL)flag
{ {

4
Source/NSMatrix.m
View file

@ -3294,7 +3294,7 @@ static SEL getSel;
/**<p>Returns the column number of the selected cell or -1 /**<p>Returns the column number of the selected cell or -1
if no cell is selected</p><p>See Also: -selectedRow -selectedCell</p> if no cell is selected</p><p>See Also: -selectedRow -selectedCell</p>
*/ */
- (int) selectedColumn - (NSInteger) selectedColumn
{ {
return _selectedColumn; return _selectedColumn;
} }
@ -3303,7 +3303,7 @@ static SEL getSel;
/**<p>Returns the row number of the selected cell or -1 /**<p>Returns the row number of the selected cell or -1
if no cell is selected</p><p>See Also: -selectedColumn -selectedCell</p> if no cell is selected</p><p>See Also: -selectedColumn -selectedCell</p>
*/ */
- (int) selectedRow - (NSInteger) selectedRow
{ {
return _selectedRow; return _selectedRow;
} }

4
Source/NSNibBindingConnector.m
View file

@ -40,8 +40,8 @@
{ {
if((self = [super init]) != nil) if((self = [super init]) != nil)
{ {
_binding = RETAIN([NSString stringWithString: @""]); _binding = @"";
_keyPath = RETAIN([NSString stringWithString: @""]); _keyPath = @"";
_options = RETAIN([NSMutableDictionary dictionary]); _options = RETAIN([NSMutableDictionary dictionary]);
} }
return self; return self;

6
Source/NSOutlineView.m
View file

@ -911,7 +911,7 @@ static NSImage *unexpandable = nil;
/* /*
* Drawing * Drawing
*/ */
- (void) drawRow: (int)rowIndex clipRect: (NSRect)aRect - (void) drawRow: (NSInteger)rowIndex clipRect: (NSRect)aRect
{ {
int startingColumn; int startingColumn;
int endingColumn; int endingColumn;
@ -1533,8 +1533,8 @@ Also returns the child index relative to this parent. */
[self _autoloadExpandedItems]; [self _autoloadExpandedItems];
} }
- (void) editColumn: (int) columnIndex - (void) editColumn: (NSInteger) columnIndex
row: (int) rowIndex row: (NSInteger) rowIndex
withEvent: (NSEvent *) theEvent withEvent: (NSEvent *) theEvent
select: (BOOL) flag select: (BOOL) flag
{ {

2
Source/NSPrintPanel.m
View file

@ -124,7 +124,7 @@ static NSPrintPanel *shared_instance = nil;
/* Designated initializer */ /* Designated initializer */
- (id) initWithContentRect: (NSRect)contentRect - (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle styleMask: (NSUInteger)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag defer: (BOOL)flag
{ {

12
Source/NSSearchFieldCell.m
View file

@ -192,6 +192,7 @@
- (void) setRecentSearches: (NSArray *)searches - (void) setRecentSearches: (NSArray *)searches
{ {
int max; int max;
NSMutableArray *mutableSearches;
max = [self maximumRecents]; max = [self maximumRecents];
if ([searches count] > max) if ([searches count] > max)
@ -199,13 +200,14 @@
id buffer[max]; id buffer[max];
[searches getObjects: buffer range: NSMakeRange(0, max)]; [searches getObjects: buffer range: NSMakeRange(0, max)];
searches = [NSMutableArray arrayWithObjects: buffer count: max]; mutableSearches = [[NSMutableArray alloc] initWithObjects: buffer count: max];
} }
else else
{ {
searches = [NSMutableArray arrayWithArray: searches]; mutableSearches = [[NSMutableArray alloc] initWithArray: searches];
} }
ASSIGN(_recent_searches, searches); [_recent_searches release];
_recent_searches = mutableSearches;
[self _saveSearches]; [self _saveSearches];
} }
@ -377,8 +379,8 @@
inView: (NSView*)controlView inView: (NSView*)controlView
editor: (NSText*)textObject editor: (NSText*)textObject
delegate: (id)anObject delegate: (id)anObject
start: (int)selStart start: (NSInteger)selStart
length: (int)selLength length: (NSInteger)selLength
{ {
// constrain to visible text area // constrain to visible text area
[super selectWithFrame: [self searchTextRectForBounds: aRect] [super selectWithFrame: [self searchTextRectForBounds: aRect]

82
Source/NSTableView.m
View file

@ -159,7 +159,7 @@ typedef struct _tableViewFlags
@end @end
@interface NSTableView (EventLoopHelper) @interface NSTableView (EventLoopHelper)
- (void) _trackCellAtColumn:(int)column row:(int)row withEvent:(NSEvent *)ev; - (void) _trackCellAtColumn:(NSInteger)column row:(NSInteger)row withEvent:(NSEvent *)ev;
- (BOOL) _startDragOperationWithEvent:(NSEvent *)theEvent; - (BOOL) _startDragOperationWithEvent:(NSEvent *)theEvent;
@end @end
@ -2093,12 +2093,12 @@ static void computeNewSelection
* Table Dimensions * Table Dimensions
*/ */
- (int) numberOfColumns - (NSInteger) numberOfColumns
{ {
return _numberOfColumns; return _numberOfColumns;
} }
- (int) numberOfRows - (NSInteger) numberOfRows
{ {
return _numberOfRows; return _numberOfRows;
} }
@ -2163,7 +2163,7 @@ static void computeNewSelection
[self tile]; [self tile];
} }
- (void) moveColumn: (int)columnIndex toColumn: (int)newIndex - (void) moveColumn: (NSInteger)columnIndex toColumn: (NSInteger)newIndex
{ {
/* The range of columns which need to be shifted, /* The range of columns which need to be shifted,
extremes included */ extremes included */
@ -2260,7 +2260,7 @@ static void computeNewSelection
NSDefaultMallocZone ()]); NSDefaultMallocZone ()]);
} }
- (int) columnWithIdentifier: (id)identifier - (NSInteger) columnWithIdentifier: (id)identifier
{ {
NSEnumerator *enumerator = [_tableColumns objectEnumerator]; NSEnumerator *enumerator = [_tableColumns objectEnumerator];
NSTableColumn *tb; NSTableColumn *tb;
@ -2381,12 +2381,12 @@ static void computeNewSelection
return _target; return _target;
} }
- (int) clickedColumn - (NSInteger) clickedColumn
{ {
return _clickedColumn; return _clickedColumn;
} }
- (int) clickedRow - (NSInteger) clickedRow
{ {
return _clickedRow; return _clickedRow;
} }
@ -2395,7 +2395,7 @@ static void computeNewSelection
* The NSTableHeaderView calls this method when it receives a double click. * The NSTableHeaderView calls this method when it receives a double click.
*/ */
- (void) _sendDoubleActionForColumn: (int)columnIndex - (void) _sendDoubleActionForColumn: (NSInteger)columnIndex
{ {
_clickedColumn = columnIndex; _clickedColumn = columnIndex;
_clickedRow = -1; _clickedRow = -1;
@ -2410,7 +2410,7 @@ static void computeNewSelection
* However we support adding a distinct column with the control key (unlike * However we support adding a distinct column with the control key (unlike
* Cocoa where the user can only make column range selection). * Cocoa where the user can only make column range selection).
*/ */
- (void) _selectColumn: (int)columnIndex - (void) _selectColumn: (NSInteger)columnIndex
modifiers: (unsigned int)modifiers modifiers: (unsigned int)modifiers
{ {
NSIndexSet *oldIndexes = [self selectedColumnIndexes]; NSIndexSet *oldIndexes = [self selectedColumnIndexes];
@ -2569,12 +2569,12 @@ static void computeNewSelection
/* /*
* Selecting Columns and Rows * Selecting Columns and Rows
*/ */
- (void) selectColumn: (int)columnIndex - (void) selectColumn: (NSInteger)columnIndex
byExtendingSelection: (BOOL)flag byExtendingSelection: (BOOL)flag
{ {
if (columnIndex < 0 || columnIndex > _numberOfColumns) if (columnIndex < 0 || columnIndex > _numberOfColumns)
{ {
NSDebugLLog(@"NSTableView", @"Column index %d out of table in selectColumn", columnIndex); NSDebugLLog(@"NSTableView", @"Column index %d out of table in selectColumn", (int)columnIndex);
return; return;
} }
@ -2641,12 +2641,12 @@ static void computeNewSelection
} }
} }
- (void) selectRow: (int)rowIndex - (void) selectRow: (NSInteger)rowIndex
byExtendingSelection: (BOOL)flag byExtendingSelection: (BOOL)flag
{ {
if (rowIndex < 0 || rowIndex >= _numberOfRows) if (rowIndex < 0 || rowIndex >= _numberOfRows)
{ {
NSDebugLLog(@"NSTableView", @"Row index %d out of table in selectRow", rowIndex); NSDebugLLog(@"NSTableView", @"Row index %d out of table in selectRow", (int)rowIndex);
return; return;
} }
@ -2890,7 +2890,7 @@ byExtendingSelection: (BOOL)flag
return _selectedRows; return _selectedRows;
} }
- (void) deselectColumn: (int)columnIndex - (void) deselectColumn: (NSInteger)columnIndex
{ {
if ([_selectedColumns containsIndex: columnIndex] == NO) if ([_selectedColumns containsIndex: columnIndex] == NO)
{ {
@ -2950,7 +2950,7 @@ byExtendingSelection: (BOOL)flag
[self _postSelectionDidChangeNotification]; [self _postSelectionDidChangeNotification];
} }
- (void) deselectRow: (int)rowIndex - (void) deselectRow: (NSInteger)rowIndex
{ {
if ([_selectedRows containsIndex: rowIndex] == NO) if ([_selectedRows containsIndex: rowIndex] == NO)
{ {
@ -3000,32 +3000,32 @@ byExtendingSelection: (BOOL)flag
[self _postSelectionDidChangeNotification]; [self _postSelectionDidChangeNotification];
} }
- (int) numberOfSelectedColumns - (NSInteger) numberOfSelectedColumns
{ {
return [_selectedColumns count]; return [_selectedColumns count];
} }
- (int) numberOfSelectedRows - (NSInteger) numberOfSelectedRows
{ {
return [_selectedRows count]; return [_selectedRows count];
} }
- (int) selectedColumn - (NSInteger) selectedColumn
{ {
return _selectedColumn; return _selectedColumn;
} }
- (int) selectedRow - (NSInteger) selectedRow
{ {
return _selectedRow; return _selectedRow;
} }
- (BOOL) isColumnSelected: (int)columnIndex - (BOOL) isColumnSelected: (NSInteger)columnIndex
{ {
return [_selectedColumns containsIndex: columnIndex]; return [_selectedColumns containsIndex: columnIndex];
} }
- (BOOL) isRowSelected: (int)rowIndex - (BOOL) isRowSelected: (NSInteger)rowIndex
{ {
return [_selectedRows containsIndex: rowIndex]; return [_selectedRows containsIndex: rowIndex];
} }
@ -3166,12 +3166,12 @@ byExtendingSelection: (BOOL)flag
return _gridColor; return _gridColor;
} }
- (void) setGridStyleMask: (unsigned int)gridType - (void) setGridStyleMask: (NSTableViewGridLineStyle)gridType
{ {
// FIXME // FIXME
} }
- (unsigned int) gridStyleMask - (NSTableViewGridLineStyle) gridStyleMask
{ {
// FIXME // FIXME
return 0; return 0;
@ -3282,8 +3282,8 @@ byExtendingSelection: (BOOL)flag
} }
} }
- (void) editColumn: (int) columnIndex - (void) editColumn: (NSInteger) columnIndex
row: (int) rowIndex row: (NSInteger) rowIndex
withEvent: (NSEvent *) theEvent withEvent: (NSEvent *) theEvent
select: (BOOL) flag select: (BOOL) flag
{ {
@ -3391,12 +3391,12 @@ byExtendingSelection: (BOOL)flag
return; return;
} }
- (int) editedRow - (NSInteger) editedRow
{ {
return _editedRow; return _editedRow;
} }
- (int) editedColumn - (NSInteger) editedColumn
{ {
return _editedColumn; return _editedColumn;
} }
@ -3429,8 +3429,8 @@ static inline float computePeriod(NSPoint mouseLocationWin,
return 0.01; return 0.01;
} }
- (void) _trackCellAtColumn: (int) columnIndex - (void) _trackCellAtColumn: (NSInteger) columnIndex
row: (int) rowIndex row: (NSInteger) rowIndex
withEvent: (NSEvent *) theEvent withEvent: (NSEvent *) theEvent
{ {
NSTableColumn *tb; NSTableColumn *tb;
@ -4281,13 +4281,13 @@ static BOOL selectContiguousRegion(NSTableView *self,
* Layout * Layout
*/ */
- (NSRect) rectOfColumn: (int)columnIndex - (NSRect) rectOfColumn: (NSInteger)columnIndex
{ {
NSRect rect; NSRect rect;
if (columnIndex < 0 || columnIndex > _numberOfColumns) if (columnIndex < 0 || columnIndex > _numberOfColumns)
{ {
NSDebugLLog(@"NSTableView", @"Column index %d out of table in rectOfColumn", columnIndex); NSDebugLLog(@"NSTableView", @"Column index %d out of table in rectOfColumn", (int)columnIndex);
return NSZeroRect; return NSZeroRect;
} }
@ -4298,13 +4298,13 @@ static BOOL selectContiguousRegion(NSTableView *self,
return rect; return rect;
} }
- (NSRect) rectOfRow: (int)rowIndex - (NSRect) rectOfRow: (NSInteger)rowIndex
{ {
NSRect rect; NSRect rect;
if (rowIndex < 0 || rowIndex >= _numberOfRows) if (rowIndex < 0 || rowIndex >= _numberOfRows)
{ {
NSDebugLLog(@"NSTableView", @"Row index %d out of table in rectOfRow", rowIndex); NSDebugLLog(@"NSTableView", @"Row index %d out of table in rectOfRow", (int)rowIndex);
return NSZeroRect; return NSZeroRect;
} }
@ -4376,7 +4376,7 @@ This method is deprecated, use -columnIndexesInRect:. */
return range; return range;
} }
- (int) columnAtPoint: (NSPoint)aPoint - (NSInteger) columnAtPoint: (NSPoint)aPoint
{ {
if ((NSMouseInRect (aPoint, _bounds, YES)) == NO) if ((NSMouseInRect (aPoint, _bounds, YES)) == NO)
{ {
@ -4394,7 +4394,7 @@ This method is deprecated, use -columnIndexesInRect:. */
} }
} }
- (int) rowAtPoint: (NSPoint)aPoint - (NSInteger) rowAtPoint: (NSPoint)aPoint
{ {
/* NB: Y coordinate system is flipped in NSTableView */ /* NB: Y coordinate system is flipped in NSTableView */
if ((NSMouseInRect (aPoint, _bounds, YES)) == NO) if ((NSMouseInRect (aPoint, _bounds, YES)) == NO)
@ -4416,8 +4416,8 @@ This method is deprecated, use -columnIndexesInRect:. */
} }
} }
- (NSRect) frameOfCellAtColumn: (int)columnIndex - (NSRect) frameOfCellAtColumn: (NSInteger)columnIndex
row: (int)rowIndex row: (NSInteger)rowIndex
{ {
NSRect frameRect; NSRect frameRect;
@ -4973,7 +4973,7 @@ This method is deprecated, use -columnIndexesInRect:. */
* Drawing * Drawing
*/ */
- (void) drawRow: (int)rowIndex clipRect: (NSRect)clipRect - (void) drawRow: (NSInteger)rowIndex clipRect: (NSRect)clipRect
{ {
[[GSTheme theme] drawTableViewRow: rowIndex [[GSTheme theme] drawTableViewRow: rowIndex
clipRect: clipRect clipRect: clipRect
@ -5020,7 +5020,7 @@ This method is deprecated, use -columnIndexesInRect:. */
* Scrolling * Scrolling
*/ */
- (void) scrollRowToVisible: (int)rowIndex - (void) scrollRowToVisible: (NSInteger)rowIndex
{ {
if (_super_view != nil) if (_super_view != nil)
{ {
@ -5057,7 +5057,7 @@ This method is deprecated, use -columnIndexesInRect:. */
} }
} }
- (void) scrollColumnToVisible: (int)columnIndex - (void) scrollColumnToVisible: (NSInteger)columnIndex
{ {
if (_super_view != nil) if (_super_view != nil)
{ {
@ -5346,7 +5346,7 @@ This method is deprecated, use -columnIndexesInRect:. */
dragImageOffset: offset]; dragImageOffset: offset];
} }
- (void) setDropRow: (int)row - (void) setDropRow: (NSInteger)row
dropOperation: (NSTableViewDropOperation)operation dropOperation: (NSTableViewDropOperation)operation
{ {
if (row < -1 || row > _numberOfRows if (row < -1 || row > _numberOfRows

18
Source/NSTextView.m
View file

@ -175,18 +175,18 @@ Interface for a bunch of internal methods that need to be cleaned up.
NSParagraphStyle *paragraphStyle; NSParagraphStyle *paragraphStyle;
unsigned int flags; unsigned int flags;
NSColor *insertionColor; NSColor *insertionColor;
NSArray *linkAttr; NSDictionary *linkAttr;
NSArray *markAttr; NSDictionary *markAttr;
NSArray *selectedAttr; NSDictionary *selectedAttr;
NSTextView *textView; NSTextView *textView;
} }
- (NSColor *) backgroundColor; - (NSColor *) backgroundColor;
- (NSParagraphStyle *) paragraphStyle; - (NSParagraphStyle *) paragraphStyle;
- (unsigned int) flags; - (unsigned int) flags;
- (NSColor *) insertionColor; - (NSColor *) insertionColor;
- (NSArray *) linkAttributes; - (NSDictionary *) linkAttributes;
- (NSArray *) markAttributes; - (NSDictionary *) markAttributes;
- (NSArray *) selectedAttributes; - (NSDictionary *) selectedAttributes;
- (NSTextView *) textView; - (NSTextView *) textView;
@end @end
@ -289,17 +289,17 @@ Interface for a bunch of internal methods that need to be cleaned up.
return insertionColor; return insertionColor;
} }
- (NSArray *) linkAttributes - (NSDictionary *) linkAttributes
{ {
return linkAttr; return linkAttr;
} }
- (NSArray *) markAttributes - (NSDictionary *) markAttributes
{ {
return markAttr; return markAttr;
} }
- (NSArray *) selectedAttributes - (NSDictionary *) selectedAttributes
{ {
return selectedAttr; return selectedAttr;
} }

6
Source/NSWindow.m
View file

@ -1040,7 +1040,7 @@ many times.
// FIXME: This hack is here to work around a gorm decoding problem. // FIXME: This hack is here to work around a gorm decoding problem.
if (_windowNum) if (_windowNum)
{ {
NSLog(@"Window already initialized %d", _windowNum); NSLog(@"Window already initialized %d", (int)_windowNum);
return self; return self;
} }
@ -3971,7 +3971,7 @@ resetCursorRectsForView(NSView *theView)
_frame.origin.x = (float)[theEvent data1]; _frame.origin.x = (float)[theEvent data1];
_frame.origin.y = (float)[theEvent data2]; _frame.origin.y = (float)[theEvent data2];
NSDebugLLog(@"Moving", @"Move event: %d %@", NSDebugLLog(@"Moving", @"Move event: %d %@",
_windowNum, NSStringFromPoint(_frame.origin)); (int)_windowNum, NSStringFromPoint(_frame.origin));
if (_autosaveName != nil) if (_autosaveName != nil)
{ {
[self saveFrameUsingName: _autosaveName]; [self saveFrameUsingName: _autosaveName];
@ -4083,7 +4083,7 @@ resetCursorRectsForView(NSView *theView)
} }
if ([self canBecomeKeyWindow] == YES) if ([self canBecomeKeyWindow] == YES)
{ {
NSDebugLLog(@"Focus", @"Making %d key", _windowNum); NSDebugLLog(@"Focus", @"Making %d key", (int)_windowNum);
[self makeKeyWindow]; [self makeKeyWindow];
[self makeMainWindow]; [self makeMainWindow];
[NSApp activateIgnoringOtherApps: YES]; [NSApp activateIgnoringOtherApps: YES];

2
Source/NSWorkspace.m
View file

@ -266,7 +266,7 @@ static id GSLaunched(NSNotification *notification, BOOL active)
@interface _GSWorkspaceCenter: NSNotificationCenter @interface _GSWorkspaceCenter: NSNotificationCenter
{ {
NSDistributedNotificationCenter *remote; NSNotificationCenter *remote;
} }
- (void) _handleRemoteNotification: (NSNotification*)aNotification; - (void) _handleRemoteNotification: (NSNotification*)aNotification;
- (void) _postLocal: (NSString*)name userInfo: (NSDictionary*)info; - (void) _postLocal: (NSString*)name userInfo: (NSDictionary*)info;

1
Tools/make_services.m
View file

@ -1091,7 +1091,6 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
while (i-- > 0) while (i-- > 0)
{ {
NSString *type;
str = [snd objectAtIndex: i]; str = [snd objectAtIndex: i];
/* For UNIX I/O or file mapping, the send type must be a /* For UNIX I/O or file mapping, the send type must be a