From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Tue, 12 Oct 2004 20:14:23 +0000 (+0000)
Subject: Reverted conflict with Darwin.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/05689a13cc183d26a54c4a082bc5a6d6efd177e4

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 d0ec9403a6..43c3846744 100644
--- 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 57ec42af30..a4be5ca35c 100644
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -38,6 +38,11 @@
 // implementation
 // ============================================================================
 
+wxChoiceBase::~wxChoiceBase()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------