disambiguate between 2 base class IsEmpty() versions too (bug 1831121)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,13 +29,15 @@ class WXDLLEXPORT wxComboBoxBase : public wxItemContainer,
|
|||||||
public wxTextEntry
|
public wxTextEntry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// override this to disambiguate between two base classes versions
|
// override these methods to disambiguate between two base classes versions
|
||||||
virtual void Clear()
|
virtual void Clear()
|
||||||
{
|
{
|
||||||
wxTextEntry::Clear();
|
wxTextEntry::Clear();
|
||||||
wxItemContainer::Clear();
|
wxItemContainer::Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
|
||||||
|
|
||||||
// also bring in GetSelection() versions of both base classes in scope
|
// also bring in GetSelection() versions of both base classes in scope
|
||||||
//
|
//
|
||||||
// NB: GetSelection(from, to) could be already implemented in wxTextEntry
|
// NB: GetSelection(from, to) could be already implemented in wxTextEntry
|
||||||
|
Reference in New Issue
Block a user