fixed mem leak in wxDataObjectComposite

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

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 7c7aee91f9317e0090929335078c315a6e112016..923f2970949b2b973f3d39e8303a9e162556f5e5 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -254,7 +254,7 @@ class WXDLLEXPORT wxDataObjectComposite : public wxDataObject
 {
 public:
     // ctor
 {
 public:
     // ctor

-    wxDataObjectComposite() { m_preferred = 0; }
+    wxDataObjectComposite();

 
     // add data object (it will be deleted by wxDataObjectComposite, hence it
     // must be allocated on the heap) whose format will become the preferred
 
     // add data object (it will be deleted by wxDataObjectComposite, hence it
     // must be allocated on the heap) whose format will become the preferred

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index d2d6a4e5b72fdcb299d76f06a0b6ab56ae169a89..661b8114dc28008f311f4f3a87bdde4c100a01e7 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -94,6 +94,13 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------
 
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------
 

+wxDataObjectComposite::wxDataObjectComposite()
+{
+    m_preferred = 0;
+
+    m_dataObjects.DeleteContents(TRUE);
+}
+

 wxDataObjectSimple *
 wxDataObjectComposite::GetObject(const wxDataFormat& format) const
 {
 wxDataObjectSimple *
 wxDataObjectComposite::GetObject(const wxDataFormat& format) const
 {