gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 05:32:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change also internal methods and ivars to reflect NSInteger transition of rows and columns.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39094 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2015-10-27 18:11:46 +00:00
parent 7272bf329b
commit 40e0788f6d
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2015-10-27 Riccardo Mottola <rm@gnu.org>
* 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 <FredKiefer@gmx.de>
* Source/NSBitmapImageRep.m

18
Headers/AppKit/NSMatrix.h
View file

@ -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 <ovidiu@net-community.com>
Date: March 1997
@ -56,10 +56,10 @@ typedef enum _NSMatrixMode {
{
__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 @@ typedef enum _NSMatrixMode {
SEL _doubleAction;
SEL _errorAction;
id _selectedCell;
int _selectedRow;
int _selectedColumn;
NSInteger _selectedRow;
NSInteger _selectedColumn;
BOOL _allowsEmptySelection;
BOOL _selectionByRect;
BOOL _drawsBackground;
@ -87,8 +87,8 @@ typedef enum _NSMatrixMode {
BOOL _autosizesCells;
BOOL _autoscroll;
id _reserved1;
int _dottedRow;
int _dottedColumn;
NSInteger _dottedRow;
NSInteger _dottedColumn;
}
/*

24
Source/NSMatrix.m
View file

@ -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 <ovidiu@net-community.com>
Date: March 1997
@ -1222,7 +1222,7 @@ static SEL getSel;
[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 @@ static SEL getSel;
* 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 @@ static SEL getSel;
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