Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preparing for completions support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-04-13 09:22:17 +00:00
parent 1d037f6cc8
commit 00ba1af984
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osx/cocoa/srchctrl.mm
View File

@@ -61,6 +61,30 @@
impl->controlTextDidChange();
}
- (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words
forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(int*)index
{
NSMutableArray* matches = NULL;
NSString* partialString;
partialString = [[textView string] substringWithRange:charRange];
matches = [NSMutableArray array];
wxTextWidgetImpl* impl = (wxTextWidgetImpl* ) wxWidgetImpl::FindFromWXWidget( self );
wxArrayString completions;
// adapt to whatever strategy we have for getting the strings
// impl->GetTextEntry()->GetCompletions(wxCFStringRef::AsString(partialString), completions);
for (size_t i = 0; i < completions.GetCount(); ++i )
[matches addObject: wxCFStringRef(completions[i]).AsNSString()];
// [matches sortUsingSelector:@selector(compare:)];
return matches;
}
@end
// ============================================================================

23
src/osx/cocoa/textctrl.mm
View File

@@ -289,6 +289,29 @@ protected :
impl->controlTextDidChange();
}
- (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words
forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(int*)index
{
NSMutableArray* matches = NULL;
NSString* partialString;
partialString = [[textView string] substringWithRange:charRange];
matches = [NSMutableArray array];
wxTextWidgetImpl* impl = (wxTextWidgetImpl* ) wxWidgetImpl::FindFromWXWidget( self );
wxArrayString completions;
// adapt to whatever strategy we have for getting the strings
// impl->GetTextEntry()->GetCompletions(wxCFStringRef::AsString(partialString), completions);
for (size_t i = 0; i < completions.GetCount(); ++i )
[matches addObject: wxCFStringRef(completions[i]).AsNSString()];
// [matches sortUsingSelector:@selector(compare:)];
return matches;
}
- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector
{
wxUnusedVar(textView);