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

SetSelection(wxNOT_FOUND) now works correctly.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-10-17 18:21:05 +00:00
parent f17e0ebd63
commit f6fc052ae5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/univ/combobox.cpp
View File

@@ -145,9 +145,9 @@ void wxComboListBox::SetStringValue(const wxString& value)
{ {
if ( !value.empty() ) if ( !value.empty() )
{ {
if (FindString(value) != wxNOT_FOUND) if (FindString(value) != wxNOT_FOUND)
wxListBox::SetStringSelection(value); wxListBox::SetStringSelection(value);
} }
else else
wxListBox::SetSelection(-1); wxListBox::SetSelection(-1);
} }
@@ -386,10 +386,11 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
void wxComboBox::SetSelection(int n) void wxComboBox::SetSelection(int n)
{ {
wxCHECK_RET( IsValid(n), _T("invalid index in wxComboBox::Select") ); wxCHECK_RET( (n == wxNOT_FOUND || IsValid(n)), _T("invalid index in wxComboBox::Select") );
GetLBox()->SetSelection(n); GetLBox()->SetSelection(n);
if ( GetTextCtrl() ) GetTextCtrl()->SetValue(GetLBox()->GetString(n)); if ( GetTextCtrl() )
GetTextCtrl()->SetValue(GetLBox()->GetString(n));
} }
int wxComboBox::GetSelection() const int wxComboBox::GetSelection() const

1
src/univ/listbox.cpp
View File

@@ -483,6 +483,7 @@ void wxListBox::DoSetSelection(int n, bool select)
// selecting an item in a single selection listbox deselects // selecting an item in a single selection listbox deselects
// all the others // all the others
DeselectAll(); DeselectAll();
return;
} }
m_selections.Add(n); m_selections.Add(n);