Clear columns on destruction

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

diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index 2b3eeded38283594d789e5a3b40bdac601762682..9c5aa166ebd13c34186b94646e7bc03a8485382c 100644 (file)
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -476,6 +476,8 @@ public:
     this->Create(parent, id, pos, size, style, validator );
   }
 
     this->Create(parent, id, pos, size, style, validator );
   }
 

+  ~wxDataViewCtrl();
+

  // explicit control creation
   bool Create(wxWindow *parent, wxWindowID id, wxPoint const& pos=wxDefaultPosition, wxSize const& size=wxDefaultSize, long style=0,
               wxValidator const& validator=wxDefaultValidator);
  // explicit control creation
   bool Create(wxWindow *parent, wxWindowID id, wxPoint const& pos=wxDefaultPosition, wxSize const& size=wxDefaultSize, long style=0,
               wxValidator const& validator=wxDefaultValidator);

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index 5e2df96b5b74bd77b03e885b2fc9e3d371b5d4a9..5dd666c1ca499cc69d2087bf17df29ca30028778 100644 (file)
--- a/src/mac/carbon/dataview.cpp
+++ b/src/mac/carbon/dataview.cpp
@@ -1078,6 +1078,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn,wxDataViewColumnBase)
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------

+
+
+wxDataViewCtrl::~wxDataViewCtrl()
+{
+   ClearColumns();
+}
+

 #pragma mark -
 void wxDataViewCtrl::Init()
 {
 #pragma mark -
 void wxDataViewCtrl::Init()
 {