build fixes and cleanup

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 02786e98cd3363c82b2b71b5aed9d6c1386f024b..df021af849a3669ca8404e22c730b61e720c4e65 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -109,7 +109,7 @@ wxDataObjectComposite::GetObject(const wxDataFormat& format) const
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return (wxDataObjectSimple *)NULL;
+    return NULL;

 }
 
 void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
 }
 
 void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)


@@ -320,7 +320,7 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 bool wxTextDataObject::SetData(const wxDataFormat& format,
                                size_t len, const void *buf_)
 {
 bool wxTextDataObject::SetData(const wxDataFormat& format,
                                size_t len, const void *buf_)
 {

-    const char * const buf = wx_static_cast(const char *, buf_);
+    const char * const buf = static_cast<const char *>(buf_);

 
     if ( buf == NULL )
         return false;
 
     if ( buf == NULL )
         return false;


@@ -449,7 +449,7 @@ void wxCustomDataObject::Free()
 {
     delete [] (char*)m_data;
     m_size = 0;
 {
     delete [] (char*)m_data;
     m_size = 0;

-    m_data = (void*)NULL;
+    m_data = NULL;

 }
 
 size_t wxCustomDataObject::GetDataSize() const
 }
 
 size_t wxCustomDataObject::GetDataSize() const