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

Merge from revision 35723 from main branch plus NSCell allowsUndo flag extract from xib

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@35724 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-10-19 22:51:20 +00:00
parent b155bbdc2d
commit 36e77b95f7
40 changed files with 828 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/NSComboBoxCell.m
View file

@ -1255,29 +1255,29 @@ static GSComboWindow *gsWindow = nil;
{
if (_dataSource == nil)
{
NSLog(@"%@: No data source currently specified", self);
}
NSLog(@"%@: No data source currently specified", self);
}
else if ([_dataSource respondsToSelector: @selector(comboBox:completedString:)])
{
return [_dataSource comboBox: (NSComboBox *)[self controlView]
completedString: substring];
}
return [_dataSource comboBox: (NSComboBox *)[self controlView]
completedString: substring];
}
else if ([_dataSource respondsToSelector: @selector(comboBoxCell:completedString:)])
{
return [_dataSource comboBoxCell: self completedString: substring];
}
return [_dataSource comboBoxCell: self completedString: substring];
}
else
{
unsigned int i;
for (i = 0; i < [self numberOfItems]; i++)
{
NSString *str = [self _stringValueAtIndex: i];
NSString *str = [self _stringValueAtIndex: i];
if ([str length] > [substring length] && [str hasPrefix: substring])
return str;
}
}
if ([str length] > [substring length] && [str hasPrefix: substring])
return str;
}
}
}
else
{
@ -1285,10 +1285,10 @@ static GSComboWindow *gsWindow = nil;
for (i = 0; i < [_popUpList count]; i++)
{
NSString *str = [[_popUpList objectAtIndex: i] description];
NSString *str = [[_popUpList objectAtIndex: i] description];
if ([str length] > [substring length] && [str hasPrefix: substring])
return str;
if ([str length] > [substring length] && [str hasPrefix: substring])
return str;
}
}
@ -1749,14 +1749,14 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
&& _prevSelectedRange.location < selectedRange.location)
{
more = [self completedString: myString];
if (more && [more isEqualToString: myString] == NO)
if ((more != nil) && [more isEqualToString: myString] == NO)
{
[textObject setString: more];
location = myStringLength;
[textObject setString: more];
location = myStringLength;
length = [more length] - location;
[textObject setSelectedRange: NSMakeRange(location, length)];
[textObject scrollRangeToVisible: NSMakeRange(location, length)];
}
[textObject setSelectedRange: NSMakeRange(location, length)];
[textObject scrollRangeToVisible: NSMakeRange(location, length)];
}
}
RELEASE(myString);
}