Warning fix.

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 5ecf2fc08855bd0e915c6a7d356f657b7d72177d..cbed32d72f9ba9c76ba6d303b6c71d540b8c6a7f 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -238,7 +238,7 @@ size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
     wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
 
 {
     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
 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const


@@ -247,8 +247,6 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
         return false;
 
     wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
         return false;
 
     wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );

-    if ( buffer == NULL )
-        return false;

 
     strcpy( (char*)buf, buffer );
 
 
     strcpy( (char*)buf, buffer );
 


@@ -262,8 +260,6 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
         return false;
 
     wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
         return false;
 
     wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );

-    if ( buffer == NULL )
-        return false;

 
     SetText( buffer );
 
 
     SetText( buffer );