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

Have wxUniv wxComboBox inherit from wxItemContainer instead of wxComboBoxBase, since the latter is derived from wxTextEntry which conflicts with the recent change in wxComboCtrl (fixes #12789)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-12-20 11:27:13 +00:00
parent 084a875a2e
commit a7f62f3909
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/univ/combobox.h
View File

@@ -31,7 +31,10 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
// wxComboBox: a combination of text control and a listbox // wxComboBox: a combination of text control and a listbox
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxComboBoxBase // NB: Normally we'd like wxComboBox to inherit from wxComboBoxBase, but here
// we can't really do that since both wxComboBoxBase and wxComboCtrl inherit
// from wxTextCtrl.
class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxItemContainer
{ {
public: public:
// ctors and such // ctors and such
@@ -118,6 +121,15 @@ public:
virtual bool CanUndo() const; virtual bool CanUndo() const;
virtual bool CanRedo() const; virtual bool CanRedo() const;
// override these methods to disambiguate between two base classes versions
virtual void Clear()
{
wxComboCtrl::Clear();
wxItemContainer::Clear();
}
bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
// wxControlWithItems methods // wxControlWithItems methods
virtual void DoClear(); virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n);