mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 18:11:06 +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
|
@ -1,3 +1,9 @@
|
|||
Tues July 14 1998 Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
|
||||
* 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.
|
||||
|
||||
Fri May 29 13:30:14 1998 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* Headers/gnustep/gui/AppKit.h: Include Foundation.h.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -392,22 +392,22 @@
|
|||
//
|
||||
// Editing Text
|
||||
//
|
||||
- (void)editWithFrame:(NSRect)aRect
|
||||
inView:(NSView *)controlView
|
||||
editor:(NSText *)textObject
|
||||
delegate:(id)anObject
|
||||
event:(NSEvent *)theEvent
|
||||
- (void)editWithFrame:(NSRect)aRect
|
||||
inView:(NSView *)controlView
|
||||
editor:(NSText *)textObject
|
||||
delegate:(id)anObject
|
||||
event:(NSEvent *)theEvent
|
||||
{}
|
||||
|
||||
- (void)endEditing:(NSText *)textObject
|
||||
{}
|
||||
|
||||
- (void)selectWithFrame:(NSRect)aRect
|
||||
inView:(NSView *)controlView
|
||||
editor:(NSText *)textObject
|
||||
delegate:(id)anObject
|
||||
start:(int)selStart
|
||||
length:(int)selLength
|
||||
inView:(NSView *)controlView
|
||||
editor:(NSText *)textObject
|
||||
delegate:(id)anObject
|
||||
start:(int)selStart
|
||||
length:(int)selLength
|
||||
{}
|
||||
|
||||
//
|
||||
|
@ -455,7 +455,7 @@
|
|||
|
||||
- (BOOL)isOpaque
|
||||
{
|
||||
return NO;
|
||||
return cell_bezeled;
|
||||
}
|
||||
|
||||
- (void)setBezeled:(BOOL)flag
|
||||
|
|
|
@ -363,8 +363,6 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
|
|||
if (post_frame_changes)
|
||||
[[NSNotificationCenter defaultCenter]
|
||||
postNotificationName:NSViewFrameDidChangeNotification object:self];
|
||||
|
||||
[self setNeedsDisplay:YES]; // FAR
|
||||
}
|
||||
|
||||
- (void)setFrameOrigin:(NSPoint)newOrigin
|
||||
|
|
Loading…
Reference in a new issue