cleanup - reformatting

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

src/common/dobjcmn.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/dobjcmn.cpp
+// Name:        src/common/dobjcmn.cpp
 // Purpose:     implementation of data object methods common to all platforms
 // Author:      Vadim Zeitlin, Robert Roebling
 // Modified by:
@@ -9,14 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
+// For compilers that support precompilation, includes "wx.h".
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -28,7 +21,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/debug.h"
-#endif // WX_PRECOMP
+#endif
 
 #include "wx/dataobj.h"
 
@@ -244,13 +237,17 @@ static inline wxMBConv& GetConv(const wxDataFormat& format)
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
     wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+
     return buffer ? strlen( buffer ) + 1 : 0;
 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 {
+    if ( buf == NULL )
+        return false;
+
     wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
-    if ( !buffer )
+    if ( buffer == NULL )
         return false;
 
     strcpy( (char*)buf, buffer );
@@ -261,8 +258,11 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 bool wxTextDataObject::SetData(const wxDataFormat& format,
                                size_t WXUNUSED(len), const void *buf)
 {
+    if ( buf == NULL )
+        return false;
+
     wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
-    if ( !buffer )
+    if ( buffer == NULL )
         return false;
 
     SetText( buffer );
@@ -276,27 +276,32 @@ static wxMBConvUTF16 sUTF16Converter ;
 
 static inline wxMBConv& GetConv(const wxDataFormat& format)
 {
-    return format == wxDF_UNICODETEXT ? (wxMBConv&) sUTF16Converter
+    return
+        format == wxDF_UNICODETEXT
+        ? (wxMBConv&) sUTF16Converter
         : (wxMBConv&) wxConvLocal;
 }
 
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
-    size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 )  
+    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
-        + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ;
+    len += (format == wxDF_UNICODETEXT ? 2 : 1);
+
     return len;
 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 {
-    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( buf == NULL )
-    if ( !buffer )
         return false;
 
-    size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 )  
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
-        + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ;
 
-    memcpy( (char*) buf, (const char*) buffer , len ); // trailing (uni)char 0
+    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
+    len += (format == wxDF_UNICODETEXT ? 2 : 1);
+
+    // trailing (uni)char 0
+    memcpy( (char*)buf, (const char*)buffer, len );
 
     return true;
 }
@@ -304,10 +309,11 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 bool wxTextDataObject::SetData(const wxDataFormat& format,
                                size_t WXUNUSED(len), const void *buf)
 {
-    wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf);
+    if ( buf == NULL )
-    if ( !buffer )
         return false;
 
+    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
+
     SetText( buffer );
 
     return true;
@@ -381,7 +387,7 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
     }
 }
 
-#endif // 0
+#endif
 
 // ----------------------------------------------------------------------------
 // wxCustomDataObject
@@ -390,7 +396,8 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
 wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format)
     : wxDataObjectSimple(format)
 {
-    m_data = (void *)NULL;
+    m_data = NULL;
+    m_size = 0;
 }
 
 wxCustomDataObject::~wxCustomDataObject()
@@ -425,8 +432,11 @@ size_t wxCustomDataObject::GetDataSize() const
 
 bool wxCustomDataObject::GetDataHere(void *buf) const
 {
+    if ( buf == NULL )
+        return false;
+
     void *data = GetData();
-    if ( !data )
+    if ( data == NULL )
         return false;
 
     memcpy( buf, data, GetSize() );
@@ -439,10 +449,11 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf)
     Free();
 
     m_data = Alloc(size);
-    if ( !m_data )
+    if ( m_data == NULL )
         return false;
 
-    memcpy(m_data, buf, m_size = size);
+    m_size = size;
+    memcpy( m_data, buf, m_size );
 
     return true;
 }