Unix compilation fixes after last commit

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 99e3947c72072bb8e4ca7467859d24f179de616b..675ebdf2c08e980da48ba842eb8d352647c3f400 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/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
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
+// For compilers that support precompilation, includes "wx.h".
 #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"
 
@@ -62,15 +55,15 @@ wxDataObjectBase::~wxDataObjectBase()
 bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
                                    Direction dir) const
 {
-    size_t nFormatCount = GetFormatCount(dir);
+    size_t nFormatCount = GetFormatCount( dir );
     if ( nFormatCount == 1 )
     {
-        return format == GetPreferredFormat(dir);
+        return format == GetPreferredFormat( dir );
     }
     else
     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
-        GetAllFormats(formats, dir);
+        GetAllFormats( formats, dir );
 
         size_t n;
         for ( n = 0; n < nFormatCount; n++ )
@@ -97,7 +90,7 @@ wxDataObjectComposite::wxDataObjectComposite()
 
 wxDataObjectComposite::~wxDataObjectComposite()
 {
-    WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects);
+    WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects );
 }
 
 wxDataObjectSimple *
@@ -168,7 +161,7 @@ const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
 void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
                                               const wxDataFormat& format )
 {
-    wxDataObjectSimple *dataObj = GetObject(format);
+    wxDataObjectSimple *dataObj = GetObject( format );
 
     wxCHECK_MSG( dataObj, NULL,
                  wxT("unsupported format in wxDataObjectComposite"));
@@ -209,24 +202,24 @@ size_t wxDataObjectComposite::GetDataSize(const wxDataFormat& format) const
 bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format,
                                         void *buf) const
 {
-    wxDataObjectSimple *dataObj = GetObject(format);
+    wxDataObjectSimple *dataObj = GetObject( format );
 
     wxCHECK_MSG( dataObj, false,
                  wxT("unsupported format in wxDataObjectComposite"));
 
-    return dataObj->GetDataHere(buf);
+    return dataObj->GetDataHere( buf );
 }
 
 bool wxDataObjectComposite::SetData(const wxDataFormat& format,
                                     size_t len,
                                     const void *buf)
 {
-    wxDataObjectSimple *dataObj = GetObject(format);
+    wxDataObjectSimple *dataObj = GetObject( format );
 
     wxCHECK_MSG( dataObj, false,
                  wxT("unsupported format in wxDataObjectComposite"));
 
-    return dataObj->SetData(len, buf);
+    return dataObj->SetData( len, buf );
 }
 
 // ----------------------------------------------------------------------------
@@ -244,16 +237,21 @@ 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;
+
+    return buffer ? strlen( buffer ) : 0;
 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 {
+    if ( !buf )
+        return false;
+
     wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
     if ( !buffer )
         return false;
 
-    strcpy( (char*) buf, buffer );
+    memcpy( (char*) buf, buffer, GetDataSize(format) );
+    // strcpy( (char*) buf, buffer );
 
     return true;
 }
@@ -261,41 +259,48 @@ 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 ( !buffer )
+    if ( buf == NULL )
         return false;
 
-    SetText(buffer);
+    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
+
+    SetText( buffer );
 
     return true;
 }
 
 #elif wxUSE_UNICODE && defined(__WXMAC__)
 
-static wxMBConvUTF16 sUTF16Converter ;
+static wxMBConvUTF16 sUTF16Converter;
 
 static inline wxMBConv& GetConv(const wxDataFormat& format)
 {
-    return format == wxDF_UNICODETEXT ? sUTF16Converter : (wxMBConv&) wxConvLocal;
+    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 )  
-        + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ;
-    return len ;
+    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
+    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 ( !buffer )
+    if ( buf == NULL )
         return false;
 
-    size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 )  
-        + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ;
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
 
-    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;
 }
@@ -303,12 +308,13 @@ 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 ( !buffer )
+    if ( buf == NULL )
         return false;
-    
-    SetText(buffer);
-    
+
+    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
+
+    SetText( buffer );
+
     return true;
 }
 
@@ -321,14 +327,14 @@ size_t wxTextDataObject::GetDataSize() const
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
-    wxStrcpy((wxChar *)buf, GetText().c_str());
+    wxStrcpy( (wxChar*)buf, GetText().c_str() );
 
     return true;
 }
 
 bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {
-    SetText(wxString((const wxChar *)buf));
+    SetText( wxString((const wxChar*)buf) );
 
     return true;
 }
@@ -380,7 +386,7 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
     }
 }
 
-#endif // 0
+#endif
 
 // ----------------------------------------------------------------------------
 // wxCustomDataObject
@@ -389,7 +395,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()
@@ -412,9 +419,9 @@ void *wxCustomDataObject::Alloc(size_t size)
 
 void wxCustomDataObject::Free()
 {
-    delete [] (char *)m_data;
+    delete [] (char*)m_data;
     m_size = 0;
-    m_data = (void *)NULL;
+    m_data = (void*)NULL;
 }
 
 size_t wxCustomDataObject::GetDataSize() const
@@ -424,11 +431,14 @@ 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());
+    memcpy( buf, data, GetSize() );
 
     return true;
 }
@@ -438,10 +448,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;
 }
@@ -473,7 +484,7 @@ wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
         return wxDragNone;
 
     wxTextDataObject *dobj = (wxTextDataObject *)m_dataObject;
-    return OnDropText(x, y, dobj->GetText()) ? def : wxDragNone;
+    return OnDropText( x, y, dobj->GetText() ) ? def : wxDragNone;
 }
 
 // ----------------------------------------------------------------------------
@@ -491,7 +502,7 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
         return wxDragNone;
 
     wxFileDataObject *dobj = (wxFileDataObject *)m_dataObject;
-    return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
+    return OnDropFiles( x, y, dobj->GetFilenames() ) ? def : wxDragNone;
 }
 
 #endif // wxUSE_DRAG_AND_DROP