From f7dfb0b59fab3266e1268c76cc22107ce07fad29 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 13 Nov 2007 15:22:40 +0000 Subject: [PATCH] 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 --- include/wx/combobox.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/combobox.h b/include/wx/combobox.h index ac02a10a32..4f98670f68 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -29,13 +29,15 @@ class WXDLLEXPORT wxComboBoxBase : public wxItemContainer, public wxTextEntry { public: - // override this to disambiguate between two base classes versions + // override these methods to disambiguate between two base classes versions virtual void Clear() { wxTextEntry::Clear(); wxItemContainer::Clear(); } + bool IsEmpty() const { return wxItemContainer::IsEmpty(); } + // also bring in GetSelection() versions of both base classes in scope // // NB: GetSelection(from, to) could be already implemented in wxTextEntry -- 2.45.2