gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 15:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patches partly by Andreas Höschler <ahoesch@smartsoft.de>.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25476 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-09-11 12:13:35 +00:00
parent 83dba0e1a3
commit 339e3acbef
3 changed files with 66 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Source/NSTableView.m
View file

@ -3160,47 +3160,49 @@ byExtendingSelection: (BOOL)flag
formatter = [_editedCell formatter];
string = AUTORELEASE([[_textObject text] copy]);
if (formatter == nil)
{
newObjectValue = string;
}
else
if (formatter != nil)
{
NSString *error;
if ([formatter getObjectValue: &newObjectValue
forString: string
errorDescription: &error] == NO)
errorDescription: &error] == YES)
{
if ([_delegate respondsToSelector:
@selector(control:didFailToFormatString:errorDescription:)])
[_editedCell setObjectValue: newObjectValue];
if (_dataSource_editable)
{
if ([_delegate control: self
didFailToFormatString: string
errorDescription: error] == NO)
{
validatedOK = NO;
}
else
{
newObjectValue = string;
}
NSTableColumn *tb;
tb = [_tableColumns objectAtIndex: _editedColumn];
[self _setObjectValue: newObjectValue
forTableColumn: tb
row: _editedRow];
}
return;
}
else
{
SEL sel = @selector(control:didFailToFormatString:errorDescription:);
if ([_delegate respondsToSelector: sel])
{
validatedOK = [_delegate control: self
didFailToFormatString: string
errorDescription: error];
}
// Allow an empty string to fall through
else if ([string isEqualToString: @""])
{
newObjectValue = string;
}
else
else if (![string isEqualToString: @""])
{
validatedOK = NO;
}
}
}
if (validatedOK == YES)
if (validatedOK)
{
[_editedCell setObjectValue: newObjectValue];
[_editedCell setStringValue: string];
if (_dataSource_editable)
{
@ -3208,12 +3210,9 @@ byExtendingSelection: (BOOL)flag
tb = [_tableColumns objectAtIndex: _editedColumn];
[self _setObjectValue: newObjectValue
[self _setObjectValue: string
forTableColumn: tb
row: _editedRow];
//[_dataSource tableView: self setObjectValue: newObjectValue
// forTableColumn: tb row: _editedRow];
}
}
}
@ -3485,6 +3484,12 @@ static inline float computePeriod(NSPoint mouseLocationWin,
/* Stop editing if any */
if (_textObject != nil)
{
if (_editedCell != nil
&& [_editedCell isEntryAcceptable:[_textObject text]] == NO)
{
NSBeep();
return;
}
[self validateEditing];
[self abortEditing];
}