From: Gilles Depeyrot Date: Sat, 11 May 2002 17:14:46 +0000 (+0000) Subject: added wxControlWithItems constructor/destructor (for Darwin) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7c720ce63366f2679ea04701f2e15a876c3a5d08 added wxControlWithItems constructor/destructor (for Darwin) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 38b22f90fc..1db128f7bc 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -105,6 +105,9 @@ protected: class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer { public: + wxControlWithItems() { } + virtual ~wxControlWithItems(); + // we have to redefine these functions here to avoid ambiguities in classes // deriving from us which would arise otherwise because both base classses // have the methods with the same names - hopefully, a smart compiler can diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp index aa0714d83f..67e8a80333 100644 --- a/src/common/ctrlsub.cpp +++ b/src/common/ctrlsub.cpp @@ -122,4 +122,9 @@ void *wxItemContainer::GetClientData(int n) const return DoGetItemClientData(n); } +wxControlWithItems::~wxControlWithItems() +{ + // this destructor is required for Darwin +} + #endif // wxUSE_CONTROLS