Reverted conflict with Darwin.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/choice.h b/include/wx/choice.h
index d0ec9403a6ed916a6626490794da31693ea4aa2c..43c3846744c083533700ea784e7857fba27cb0ab 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
     wxChoiceBase() { }
-    virtual ~wxChoiceBase(){};
+    virtual ~wxChoiceBase();
 
     // all generic methods are in wxControlWithItems
 

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 57ec42af309c15b6fd71bd8b184530aa2e2c6b11..a4be5ca35c5e938255881f8a10ac513b06c8d027 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -38,6 +38,11 @@
 // implementation
 // ============================================================================
 
+wxChoiceBase::~wxChoiceBase()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------