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 38b22f90fcee6157c2e516870dadcad9890e6eca..1db128f7bcb6b95ff01cdb8bb06c18785c630b41 100644 (file)
--- 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 aa0714d83f5c066ef3a2e5834913718efc6978f2..67e8a80333a1e226e832d152f58913b1b1884557 100644 (file)
--- 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