1. added SetSelection() to wxItemContainer and removed its declarations
from derived classes 2. made wxItemContainer::Select() non virtual: it simply calls SetSelection() 3. renamed wxListBox::SetSelection(n, select) to DoSetSelection() for all ports and defined non virtual SetSelection() overloads in the base class to avoid virtual functions hiding git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -64,7 +64,7 @@ bool wxItemContainer::SetStringSelection(const wxString& s)
|
||||
if ( sel == wxNOT_FOUND )
|
||||
return false;
|
||||
|
||||
Select(sel);
|
||||
SetSelection(sel);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -167,13 +167,4 @@ wxControlWithItems::~wxControlWithItems()
|
||||
// this destructor is required for Darwin
|
||||
}
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
int wxItemContainer::Number() const
|
||||
{
|
||||
return GetCount();
|
||||
}
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
#endif // wxUSE_CONTROLS
|
||||
|
||||
Reference in New Issue
Block a user