Handle client data correctly.

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index f295daac11ac6cbabc4a3f649beb6808a66030e2..6e268ed40d90f6cc7d76211336550c5bd9a40efe 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -327,8 +327,7 @@ void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
     wxList::compatibility_iterator node = m_clientObjectList.Item( n );
     if (!node) return;
 
-    wxClientData *cd = (wxClientData*) node->GetData();
-    if (cd) delete cd;
+    // wxItemContainer already deletes data for us
 
     node->SetData( (wxObject*) clientData );
 }

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index f295daac11ac6cbabc4a3f649beb6808a66030e2..6e268ed40d90f6cc7d76211336550c5bd9a40efe 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -327,8 +327,7 @@ void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
     wxList::compatibility_iterator node = m_clientObjectList.Item( n );
     if (!node) return;
 
-    wxClientData *cd = (wxClientData*) node->GetData();
-    if (cd) delete cd;
+    // wxItemContainer already deletes data for us
 
     node->SetData( (wxObject*) clientData );
 }

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index c3c5660bbf5163b8502539f6e28406182488d670..5a911361cf45633608dd12505d3a67c6c3ec64ed 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -162,7 +162,10 @@ END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
-   // delete the controls now, don't leave them alive even though they would
+    // delete client objects
+    FreeData();
+
+    // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
     if (m_text != NULL) {

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index c3c5660bbf5163b8502539f6e28406182488d670..5a911361cf45633608dd12505d3a67c6c3ec64ed 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -162,7 +162,10 @@ END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
-   // delete the controls now, don't leave them alive even though they would
+    // delete client objects
+    FreeData();
+
+    // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
     if (m_text != NULL) {