don't crash if we can't detect g_wcCharset

[wxWidgets.git] / src / common / ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index abbaabb4ffaf602277b16ff739d3d481835fa2e2..1c7e18ea27ac807f9643e750732326cd60344ddb 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -38,6 +38,11 @@
 // implementation
 // ============================================================================
 
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
@@ -61,12 +66,22 @@ void wxItemContainer::SetClientObject(int n, wxClientData *data)
     wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
                   wxT("can't have both object and void client data") );
 
-    wxClientData *clientDataOld = DoGetItemClientObject(n);
-    if ( clientDataOld )
-        delete clientDataOld;
+    // when we call SetClientObject() for the first time, m_clientDataItemsType
+    // is still wxClientData_None and so calling DoGetItemClientObject() would
+    // fail (in addition to being useless) - don't do it
+    if ( m_clientDataItemsType == wxClientData_Object )
+    {
+        wxClientData *clientDataOld = DoGetItemClientObject(n);
+        if ( clientDataOld )
+            delete clientDataOld;
+    }
+    else // m_clientDataItemsType == wxClientData_None
+    {
+        // now we have object client data
+        m_clientDataItemsType = wxClientData_Object;
+    }
 
     DoSetItemClientObject(n, data);
-    m_clientDataItemsType = wxClientData_Object;
 }
 
 wxClientData *wxItemContainer::GetClientObject(int n) const