gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-26 00:01:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25426 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-08-31 10:52:52 +00:00
parent 561e8d0985
commit ddb1df7caa
5 changed files with 140 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2007-08-31 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSWindow.m (-makeFirstResponder:): When parameter is nil,
set self as first responder and return YES.
* Source/NSCell.m (-isEntryAcceptable:): Accept empty strings.
* Source/NSTableView.m (-validateEditing): Check if delegate
supports method, before calling it.
* Source/NSTextField.m (-validateEditing): Accept empty strings.
Patches partly by Andreas Höschler <ahoesch@smartsoft.de>.
2007-08-29 Fred Kiefer <FredKiefer@gmx.de> 2007-08-29 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSCell.h: Export more private drawing methods. * Headers/AppKit/NSCell.h: Export more private drawing methods.

2
Source/NSCell.m
View file

@ -1238,7 +1238,7 @@ static NSColor *shadowCol;
- (BOOL) isEntryAcceptable: (NSString*)aString - (BOOL) isEntryAcceptable: (NSString*)aString
{ {
if (_formatter != nil) if ((_formatter != nil) && ![aString isEqualToString: @""])
{ {
id newObjectValue; id newObjectValue;

16
Source/NSTableView.m
View file

@ -3158,7 +3158,7 @@ byExtendingSelection: (BOOL)flag
BOOL validatedOK = YES; BOOL validatedOK = YES;
formatter = [_editedCell formatter]; formatter = [_editedCell formatter];
string = AUTORELEASE ([[_textObject text] copy]); string = AUTORELEASE([[_textObject text] copy]);
if (formatter == nil) if (formatter == nil)
{ {
@ -3171,10 +3171,14 @@ byExtendingSelection: (BOOL)flag
if ([formatter getObjectValue: &newObjectValue if ([formatter getObjectValue: &newObjectValue
forString: string forString: string
errorDescription: &error] == NO) errorDescription: &error] == NO)
{
if ([_delegate respondsToSelector:
@selector(control:didFailToFormatString:errorDescription:)])
{ {
if ([_delegate control: self if ([_delegate control: self
didFailToFormatString: string didFailToFormatString: string
errorDescription: error] == NO) errorDescription: error] == NO)
{ {
validatedOK = NO; validatedOK = NO;
} }
@ -3183,6 +3187,16 @@ byExtendingSelection: (BOOL)flag
newObjectValue = string; newObjectValue = string;
} }
} }
// Allow an empty string to fall through
else if ([string isEqualToString: @""])
{
newObjectValue = string;
}
else
{
validatedOK = NO;
}
}
} }
if (validatedOK == YES) if (validatedOK == YES)
{ {

27
Source/NSTextField.m
View file

@ -457,15 +457,12 @@ static Class textFieldCellClass;
{ {
NSFormatter *formatter; NSFormatter *formatter;
NSString *string; NSString *string;
BOOL validatedOK = YES;
formatter = [_cell formatter]; formatter = [_cell formatter];
string = AUTORELEASE ([[_text_object text] copy]); string = AUTORELEASE ([[_text_object text] copy]);
if (formatter == nil) if (formatter != nil)
{
[_cell setStringValue: string];
}
else
{ {
id newObjectValue; id newObjectValue;
NSString *error; NSString *error;
@ -475,20 +472,28 @@ static Class textFieldCellClass;
errorDescription: &error] == YES) errorDescription: &error] == YES)
{ {
[_cell setObjectValue: newObjectValue]; [_cell setObjectValue: newObjectValue];
return;
} }
else else
{ {
SEL sel = @selector(control:didFailToFormatString:errorDescription:); SEL sel = @selector(control:didFailToFormatString:errorDescription:);
if ([_delegate respondsToSelector: sel] && if ([_delegate respondsToSelector: sel])
[_delegate control: self
didFailToFormatString: string
errorDescription: error] == YES)
{ {
[_cell setStringValue: string]; validatedOK = [_delegate control: self
didFailToFormatString: string
errorDescription: error];
}
else if (![string isEqualToString: @""])
{
validatedOK = NO;
}
}
} }
} if (validatedOK)
{
[_cell setStringValue: string];
} }
} }
} }

4
Source/NSWindow.m
View file

@ -2819,11 +2819,11 @@ resetCursorRectsForView(NSView *theView)
return NO; return NO;
_firstResponder = aResponder; _firstResponder = aResponder;
if (![_firstResponder becomeFirstResponder]) if ((aResponder == nil) || ![_firstResponder becomeFirstResponder])
{ {
_firstResponder = self; _firstResponder = self;
[_firstResponder becomeFirstResponder]; [_firstResponder becomeFirstResponder];
return NO; return (aResponder == nil);
} }
return YES; return YES;