X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..22886fb3c34356d015591846f343344733a03149:/src/common/dobjcmn.cpp diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index b16c8e219f..675ebdf2c0 100644 --- 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,18 +9,7 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dataobjbase.h" -#endif - +// For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -32,7 +21,7 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/debug.h" -#endif // WX_PRECOMP +#endif #include "wx/dataobj.h" @@ -42,7 +31,7 @@ #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxSimpleDataObjectList); +WX_DEFINE_LIST(wxSimpleDataObjectList) // ---------------------------------------------------------------------------- // globals @@ -66,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++ ) @@ -101,7 +90,7 @@ wxDataObjectComposite::wxDataObjectComposite() wxDataObjectComposite::~wxDataObjectComposite() { - WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects); + WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects ); } wxDataObjectSimple * @@ -172,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")); @@ -213,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, + 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, + wxCHECK_MSG( dataObj, false, wxT("unsupported format in wxDataObjectComposite")); - return dataObj->SetData(len, buf); + return dataObj->SetData( len, buf ); } // ---------------------------------------------------------------------------- @@ -239,98 +228,94 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format, #if defined(__WXGTK20__) && wxUSE_UNICODE +static inline wxMBConv& GetConv(const wxDataFormat& format) +{ + // use UTF8 for wxDF_UNICODETEXT and UCS4 for wxDF_TEXT + return format == wxDF_UNICODETEXT ? wxConvUTF8 : wxConvLibc; +} + size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { - if (format == wxDF_UNICODETEXT) - { - // Use UTF8 not UCS4 - wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() ); - return strlen( (const char*) buffer ) + 1; - } - else // == wxDF_TEXT - { - wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() ); - return strlen( (const char*) buffer ) + 1; - } + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); + + return buffer ? strlen( buffer ) : 0; } bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { - if (format == wxDF_UNICODETEXT) - { - // Use UTF8 not UCS4 - wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() ); - strcpy( (char*) buf, (const char*) buffer ); - } - else - { - wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() ); - strcpy( (char*) buf, (const char*) buffer ); - } - - return TRUE; + if ( !buf ) + return false; + + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); + if ( !buffer ) + return false; + + memcpy( (char*) buf, buffer, GetDataSize(format) ); + // strcpy( (char*) buf, buffer ); + + return true; } bool wxTextDataObject::SetData(const wxDataFormat& format, size_t WXUNUSED(len), const void *buf) { - if (format == wxDF_UNICODETEXT) - SetText( wxConvUTF8.cMB2WX( (const char*) buf ) ); - else - SetText( wxConvLibc.cMB2WX( (const char*) buf ) ); - - return TRUE; + if ( buf == NULL ) + return false; + + wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf ); + + SetText( buffer ); + + return true; } #elif wxUSE_UNICODE && defined(__WXMAC__) +static wxMBConvUTF16 sUTF16Converter; + +static inline wxMBConv& GetConv(const wxDataFormat& format) +{ + return + format == wxDF_UNICODETEXT + ? (wxMBConv&) sUTF16Converter + : (wxMBConv&) wxConvLocal; +} + size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { - if (format == wxDF_UNICODETEXT) - { - // host native is UTF16 - wxMBConvUTF16BE converter ; - wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() ); - return strlen( (const char*) buffer ) + 1; - } - else // == wxDF_TEXT - { - wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() ); - return strlen( (const char*) buffer ) + 1; - } + 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 { - if (format == wxDF_UNICODETEXT) - { - // host native is UTF16 - wxMBConvUTF16BE converter ; - wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() ); - strcpy( (char*) buf, (const char*) buffer ); - } - else - { - wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() ); - strcpy( (char*) buf, (const char*) buffer ); - } - - return TRUE; + if ( buf == NULL ) + return false; + + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); + + 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; } bool wxTextDataObject::SetData(const wxDataFormat& format, size_t WXUNUSED(len), const void *buf) { - if (format == wxDF_UNICODETEXT) - { - // host native is UTF16 - wxMBConvUTF16BE converter ; - SetText( converter.cMB2WX( (const char*) buf ) ); - } - else - SetText( wxConvLibc.cMB2WX( (const char*) buf ) ); - - return TRUE; + if ( buf == NULL ) + return false; + + wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf ); + + SetText( buffer ); + + return true; } #else @@ -342,16 +327,16 @@ 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; + return true; } bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf) { - SetText(wxString((const wxChar *)buf)); + SetText( wxString((const wxChar*)buf) ); - return TRUE; + return true; } #endif @@ -401,7 +386,7 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames) } } -#endif // 0 +#endif // ---------------------------------------------------------------------------- // wxCustomDataObject @@ -410,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() @@ -433,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 @@ -445,13 +431,16 @@ size_t wxCustomDataObject::GetDataSize() const bool wxCustomDataObject::GetDataHere(void *buf) const { + if ( buf == NULL ) + return false; + void *data = GetData(); - if ( !data ) - return FALSE; + if ( data == NULL ) + return false; - memcpy(buf, data, GetSize()); + memcpy( buf, data, GetSize() ); - return TRUE; + return true; } bool wxCustomDataObject::SetData(size_t size, const void *buf) @@ -459,12 +448,13 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf) Free(); m_data = Alloc(size); - if ( !m_data ) - return FALSE; + if ( m_data == NULL ) + return false; - memcpy(m_data, buf, m_size = size); + m_size = size; + memcpy( m_data, buf, m_size ); - return TRUE; + return true; } // ============================================================================ @@ -494,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; } // ---------------------------------------------------------------------------- @@ -512,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