X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1b435afad91408d08e158a8f107981045bd8d35..9f4de6b2cf06f53a98b28f53640f3b9ec8cf4182:/src/common/dobjcmn.cpp?ds=sidebyside

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index d2d6a4e5b7..08b9a0e923 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -94,6 +94,13 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------
 
+wxDataObjectComposite::wxDataObjectComposite()
+{
+    m_preferred = 0;
+
+    m_dataObjects.DeleteContents(TRUE);
+}
+
 wxDataObjectSimple *
 wxDataObjectComposite::GetObject(const wxDataFormat& format) const
 {
@@ -139,7 +146,7 @@ size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, 0,
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetBufferOffset( format );
@@ -151,7 +158,7 @@ const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, NULL,
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetSizeFromBuffer( buffer, size, format );
@@ -162,7 +169,7 @@ void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, NULL,
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->SetSizeInBuffer( buffer, size, format );