Author: rmottola
Date: Tue Oct 27 19:11:46 2015
New Revision: 39094
URL: http://svn.gna.org/viewcvs/gnustep?rev=39094&view=rev
Log:
Change also internal methods and ivars to reflect NSInteger transition of rows
and columns.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Headers/AppKit/NSMatrix.h
libs/gui/trunk/Source/NSMatrix.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Tue Oct 27 19:11:46 2015
@@ -1,3 +1,10 @@
+2015-10-27 Riccardo Mottola <[email protected]>
+
+ * Headers/AppKit/NSMatrix.h
+ * Source/NSMatrix.m
+ Change also internal methods and ivars to reflect NSInteger transition
+ of rows and columns.
+
2015-10-24 Fred Kiefer <[email protected]>
* Source/NSBitmapImageRep.m
Modified: libs/gui/trunk/Headers/AppKit/NSMatrix.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/AppKit/NSMatrix.h?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- libs/gui/trunk/Headers/AppKit/NSMatrix.h (original)
+++ libs/gui/trunk/Headers/AppKit/NSMatrix.h Tue Oct 27 19:11:46 2015
@@ -1,7 +1,7 @@
/*
NSMatrix.h
- Copyright (C) 1996,1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1996-2015 Free Software Foundation, Inc.
Author: Ovidiu Predescu <[email protected]>
Date: March 1997
@@ -56,10 +56,10 @@
{
__strong id **_cells;
BOOL **_selectedCells;
- int _maxRows;
- int _maxCols;
- int _numRows;
- int _numCols;
+ NSInteger _maxRows;
+ NSInteger _maxCols;
+ NSInteger _numRows;
+ NSInteger _numCols;
NSZone *_myZone;
Class _cellClass;
id _cellPrototype;
@@ -78,8 +78,8 @@
SEL _doubleAction;
SEL _errorAction;
id _selectedCell;
- int _selectedRow;
- int _selectedColumn;
+ NSInteger _selectedRow;
+ NSInteger _selectedColumn;
BOOL _allowsEmptySelection;
BOOL _selectionByRect;
BOOL _drawsBackground;
@@ -87,8 +87,8 @@
BOOL _autosizesCells;
BOOL _autoscroll;
id _reserved1;
- int _dottedRow;
- int _dottedColumn;
+ NSInteger _dottedRow;
+ NSInteger _dottedColumn;
}
/*
Modified: libs/gui/trunk/Source/NSMatrix.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSMatrix.m?rev=39094&r1=39093&r2=39094&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSMatrix.m (original)
+++ libs/gui/trunk/Source/NSMatrix.m Tue Oct 27 19:11:46 2015
@@ -2,7 +2,7 @@
<abstract>Matrix class for grouping controls</abstract>
- Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996-2015 Free Software Foundation, Inc.
Author: Ovidiu Predescu <[email protected]>
Date: March 1997
@@ -1222,7 +1222,7 @@
[self setNeedsDisplay: YES];
}
-- (void) _selectCell: (NSCell *)aCell atRow: (int)row column: (int)column
+- (void) _selectCell: (NSCell *)aCell atRow: (NSInteger)row column:
(NSInteger)column
{
if (aCell)
{
@@ -1395,8 +1395,8 @@
* So, cells from A to E are selected and, if S is outside the
* range from A to E, cells from S to its closest point are unselected
*/
- int selStart = MIN(anchorPos, endPos);
- int selEnd = MAX(anchorPos, endPos);
+ NSInteger selStart = MIN(anchorPos, endPos);
+ NSInteger selEnd = MAX(anchorPos, endPos);
[self _setState: flag ? NSOnState : NSOffState
highlight: flag
startIndex: selStart
@@ -1442,14 +1442,14 @@
MPoint anchorPoint = POINT_FROM_INDEX(anchorPos);
MPoint endPoint = POINT_FROM_INDEX(endPos);
MPoint startPoint = POINT_FROM_INDEX(startPos);
- int minx_AE = MIN(anchorPoint.x, endPoint.x);
- int miny_AE = MIN(anchorPoint.y, endPoint.y);
- int maxx_AE = MAX(anchorPoint.x, endPoint.x);
- int maxy_AE = MAX(anchorPoint.y, endPoint.y);
- int minx_AS = MIN(anchorPoint.x, startPoint.x);
- int miny_AS = MIN(anchorPoint.y, startPoint.y);
- int maxx_AS = MAX(anchorPoint.x, startPoint.x);
- int maxy_AS = MAX(anchorPoint.y, startPoint.y);
+ NSInteger minx_AE = MIN(anchorPoint.x, endPoint.x);
+ NSInteger miny_AE = MIN(anchorPoint.y, endPoint.y);
+ NSInteger maxx_AE = MAX(anchorPoint.x, endPoint.x);
+ NSInteger maxy_AE = MAX(anchorPoint.y, endPoint.y);
+ NSInteger minx_AS = MIN(anchorPoint.x, startPoint.x);
+ NSInteger miny_AS = MIN(anchorPoint.y, startPoint.y);
+ NSInteger maxx_AS = MAX(anchorPoint.x, startPoint.x);
+ NSInteger maxy_AS = MAX(anchorPoint.y, startPoint.y);
[self _setState: flag ? NSOnState : NSOffState
highlight: flag
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
