mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 02:00:48 +00:00
* Source/NSBrowser.m fixed bug where column matrix was getting released
twice in method _performLoadOfColumn. * NSCell.m: isOpaque returns whether cell is bezeled per NS docs. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2835 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f07bf17280
commit
67e0ab8be0
4 changed files with 33 additions and 35 deletions
|
@ -1475,16 +1475,13 @@
|
|||
NSRect matrixRect = {{0, 0}, {100, 100}};
|
||||
int i;
|
||||
|
||||
// If we are not reusing matrixes
|
||||
// then delete the old matrix and create a new one
|
||||
// [oldm release];
|
||||
matrix = [[[_browserMatrixClass alloc]
|
||||
initWithFrame: matrixRect
|
||||
mode: NSListModeMatrix
|
||||
prototype: _browserCellPrototype
|
||||
numberOfRows: n
|
||||
numberOfColumns: 1]
|
||||
autorelease];
|
||||
matrix = [[[_browserMatrixClass alloc] // create a new col matrix
|
||||
initWithFrame: matrixRect
|
||||
mode: NSListModeMatrix
|
||||
prototype: _browserCellPrototype
|
||||
numberOfRows: n
|
||||
numberOfColumns: 1]
|
||||
autorelease];
|
||||
[matrix setAllowsEmptySelection: _allowsEmptySelection];
|
||||
if (!_allowsMultipleSelection)
|
||||
[matrix setMode: NSRadioModeMatrix];
|
||||
|
@ -1492,7 +1489,7 @@
|
|||
[matrix setAction: @selector(doClick:)];
|
||||
[matrix setDoubleAction: @selector(doDoubleClick:)];
|
||||
|
||||
[bc setColumnMatrix: matrix];
|
||||
[bc setColumnMatrix: matrix]; // set new col matrix and release old
|
||||
[sc setDocumentView: matrix];
|
||||
|
||||
// Now loop through the cells and load each one
|
||||
|
@ -1512,16 +1509,13 @@
|
|||
id oldm = [bc columnMatrix];
|
||||
NSRect matrixRect = {{0, 0}, {100, 100}};
|
||||
|
||||
// If we are not reusing matrixes
|
||||
// then delete the old matrix and create a new one
|
||||
// [oldm release];
|
||||
matrix = [[[_browserMatrixClass alloc]
|
||||
initWithFrame: matrixRect
|
||||
mode: NSListModeMatrix
|
||||
prototype: _browserCellPrototype
|
||||
numberOfRows: 0
|
||||
numberOfColumns: 0]
|
||||
autorelease];
|
||||
matrix = [[[_browserMatrixClass alloc] // create a new col matrix
|
||||
initWithFrame: matrixRect
|
||||
mode: NSListModeMatrix
|
||||
prototype: _browserCellPrototype
|
||||
numberOfRows: 0
|
||||
numberOfColumns: 0]
|
||||
autorelease];
|
||||
[matrix setAllowsEmptySelection: _allowsEmptySelection];
|
||||
if (!_allowsMultipleSelection)
|
||||
[matrix setMode: NSRadioModeMatrix];
|
||||
|
@ -1529,7 +1523,7 @@
|
|||
[matrix setAction: @selector(doClick:)];
|
||||
[matrix setDoubleAction: @selector(doDoubleClick:)];
|
||||
|
||||
[bc setColumnMatrix: matrix];
|
||||
[bc setColumnMatrix: matrix]; // set new col matrix and release old
|
||||
[sc setDocumentView: matrix];
|
||||
|
||||
// Tell the delegate to create the rows
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue