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

Added MacOSX 10.4 methods to NSControl and reworked the whole cell

Browse source 
editing mechanism.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24380 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-01-18 17:24:33 +00:00
parent 9a71af08ad
commit aa68ca06dc
8 changed files with 294 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Source/NSMatrix.m
View file

@ -1686,16 +1686,7 @@ static SEL getSel;
*/
- (void) textDidBeginEditing: (NSNotification *)aNotification
{
NSMutableDictionary *dict;
dict = [[NSMutableDictionary alloc] initWithDictionary:
[aNotification userInfo]];
AUTORELEASE (dict);
[dict setObject: [aNotification object] forKey: @"NSFieldEditor"];
[nc postNotificationName: NSControlTextDidBeginEditingNotification
object: self
userInfo: dict];
[super textDidBeginEditing: aNotification];
}
/**<p>Invokes when the text cell is changed. This methods posts a
@ -1705,7 +1696,6 @@ static SEL getSel;
*/
- (void) textDidChange: (NSNotification *)aNotification
{
NSMutableDictionary *dict;
NSFormatter *formatter;
// MacOS-X asks us to inform the cell if possible.
@ -1713,16 +1703,9 @@ static SEL getSel;
@selector(textDidChange:)])
[_selectedCell textDidChange: aNotification];
dict = [[NSMutableDictionary alloc] initWithDictionary:
[aNotification userInfo]];
AUTORELEASE (dict);
[dict setObject: [aNotification object] forKey: @"NSFieldEditor"];
[super textDidChange: aNotification];
[nc postNotificationName: NSControlTextDidChangeNotification
object: self
userInfo: dict];
formatter = [_cell formatter];
formatter = [_selectedCell formatter];
if (formatter != nil)
{
/*
@ -1742,9 +1725,14 @@ static SEL getSel;
if (wasAccepted == NO)
{
[_delegate control:self
didFailToValidatePartialString: partialString
errorDescription: error];
SEL sel = @selector(control:didFailToValidatePartialString:errorDescription:);
if ([_delegate respondsToSelector: sel])
{
[_delegate control: self
didFailToValidatePartialString: partialString
errorDescription: error];
}
}
if (newString != nil)
@ -1772,22 +1760,9 @@ static SEL getSel;
*/
- (void) textDidEndEditing: (NSNotification *)aNotification
{
NSMutableDictionary *dict;
id textMovement;
[self validateEditing];
[_selectedCell endEditing: [aNotification object]];
_textObject = nil;
dict = [[NSMutableDictionary alloc] initWithDictionary:
[aNotification userInfo]];
AUTORELEASE (dict);
[dict setObject: [aNotification object] forKey: @"NSFieldEditor"];
[nc postNotificationName: NSControlTextDidEndEditingNotification
object: self
userInfo: dict];
[super textDidEndEditing: aNotification];
textMovement = [[aNotification userInfo] objectForKey: @"NSTextMovement"];
if (textMovement)
@ -1888,7 +1863,7 @@ static SEL getSel;
NSFormatter *formatter;
id newObjectValue;
formatter = [_cell formatter];
formatter = [_selectedCell formatter];
if ([formatter getObjectValue: &newObjectValue
forString: [_textObject text]