X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fb3a512a85572ebf4b4f46eaf536727dfe4e01e..8f2ee25db4652f96f28bc8f8370bebc974e533ff:/src/common/dobjcmn.cpp diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index 53a4041c7b..ac306c2d90 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 19.10.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows Team -// Licence: wxWindows license +// Copyright: (c) wxWidgets Team +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dataobjbase.h" #endif @@ -27,6 +27,8 @@ #pragma hdrstop #endif +#if wxUSE_DATAOBJ + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/debug.h" @@ -47,7 +49,7 @@ WX_DEFINE_LIST(wxSimpleDataObjectList); // ---------------------------------------------------------------------------- static wxDataFormat dataFormatInvalid; -const wxDataFormat& wxFormatInvalid = dataFormatInvalid; +WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid; // ============================================================================ // implementation @@ -61,14 +63,51 @@ wxDataObjectBase::~wxDataObjectBase() { } +bool wxDataObjectBase::IsSupported(const wxDataFormat& format, + Direction dir) const +{ + size_t nFormatCount = GetFormatCount(dir); + if ( nFormatCount == 1 ) + { + return format == GetPreferredFormat(dir); + } + else + { + wxDataFormat *formats = new wxDataFormat[nFormatCount]; + GetAllFormats(formats, dir); + + size_t n; + for ( n = 0; n < nFormatCount; n++ ) + { + if ( formats[n] == format ) + break; + } + + delete [] formats; + + // found? + return n < nFormatCount; + } +} + // ---------------------------------------------------------------------------- // wxDataObjectComposite // ---------------------------------------------------------------------------- +wxDataObjectComposite::wxDataObjectComposite() +{ + m_preferred = 0; +} + +wxDataObjectComposite::~wxDataObjectComposite() +{ + WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects); +} + wxDataObjectSimple * wxDataObjectComposite::GetObject(const wxDataFormat& format) const { - wxSimpleDataObjectList::Node *node = m_dataObjects.GetFirst(); + wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst(); while ( node ) { wxDataObjectSimple *dataObj = node->GetData(); @@ -95,7 +134,7 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred) wxDataFormat wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const { - wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred ); + wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.Item( m_preferred ); wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") ); @@ -104,6 +143,45 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const return dataObj->GetFormat(); } +#if defined(__WXMSW__) + +size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format ) +{ + wxDataObjectSimple *dataObj = GetObject(format); + + wxCHECK_MSG( dataObj, 0, + wxT("unsupported format in wxDataObjectComposite")); + + return dataObj->GetBufferOffset( format ); +} + + +const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer, + size_t* size, + const wxDataFormat& format ) +{ + wxDataObjectSimple *dataObj = GetObject(format); + + wxCHECK_MSG( dataObj, NULL, + wxT("unsupported format in wxDataObjectComposite")); + + return dataObj->GetSizeFromBuffer( buffer, size, format ); +} + + +void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size, + const wxDataFormat& format ) +{ + wxDataObjectSimple *dataObj = GetObject(format); + + wxCHECK_MSG( dataObj, NULL, + wxT("unsupported format in wxDataObjectComposite")); + + return dataObj->SetSizeInBuffer( buffer, size, format ); +} + +#endif + size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const { // TODO what about the Get/Set only formats? @@ -114,7 +192,7 @@ void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats, Direction WXUNUSED(dir)) const { size_t n = 0; - wxSimpleDataObjectList::Node *node; + wxSimpleDataObjectList::compatibility_iterator node; for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() ) { // TODO if ( !outputOnlyToo ) && this one counts ... @@ -137,7 +215,7 @@ bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format, { wxDataObjectSimple *dataObj = GetObject(format); - wxCHECK_MSG( dataObj, FALSE, + wxCHECK_MSG( dataObj, false, wxT("unsupported format in wxDataObjectComposite")); return dataObj->GetDataHere(buf); @@ -149,7 +227,7 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format, { wxDataObjectSimple *dataObj = GetObject(format); - wxCHECK_MSG( dataObj, FALSE, + wxCHECK_MSG( dataObj, false, wxT("unsupported format in wxDataObjectComposite")); return dataObj->SetData(len, buf); @@ -159,25 +237,117 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format, // wxTextDataObject // ---------------------------------------------------------------------------- +#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 +{ + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); + return buffer ? strlen(buffer) + 1 : 0; +} + +bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const +{ + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); + if ( !buffer ) + return false; + + strcpy( (char*) buf, buffer ); + + return true; +} + +bool wxTextDataObject::SetData(const wxDataFormat& format, + size_t WXUNUSED(len), const void *buf) +{ + wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf); + if ( !buffer ) + return false; + + SetText(buffer); + + return true; +} + +#elif wxUSE_UNICODE && defined(__WXMAC__) + +size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const +{ + if (format == wxDF_UNICODETEXT) + { + // host native is UTF16 + wxMBConvUTF16BE converter ; + return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0 + } + else // == wxDF_TEXT + { + wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() ); + return strlen( (const char*) buffer ) + 1; + } +} + +bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const +{ + if (format == wxDF_UNICODETEXT) + { + // host native is UTF16 + wxMBConvUTF16BE converter ; + size_t len = converter.WC2MB( NULL , GetText().c_str() , 0 ) ; + wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() ); + memcpy( (char*) buf, (const char*) buffer , len + 2); // trailing unichar 0 + } + else + { + wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() ); + strcpy( (char*) buf, (const char*) buffer ); + } + + 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; +} + +#else + size_t wxTextDataObject::GetDataSize() const { - return GetTextLength(); + return GetTextLength() * sizeof(wxChar); } bool wxTextDataObject::GetDataHere(void *buf) const { - strcpy((char *)buf, GetText().mb_str()); + wxStrcpy((wxChar *)buf, GetText().c_str()); - return TRUE; + return true; } bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf) { - SetText(wxString((const char *)buf)); + SetText(wxString((const wxChar *)buf)); - return TRUE; + return true; } +#endif + // ---------------------------------------------------------------------------- // wxFileDataObjectBase // ---------------------------------------------------------------------------- @@ -232,9 +402,9 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames) wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format) : wxDataObjectSimple(format) { + m_data = (void *)NULL; } - wxCustomDataObject::~wxCustomDataObject() { Free(); @@ -255,7 +425,7 @@ void *wxCustomDataObject::Alloc(size_t size) void wxCustomDataObject::Free() { - delete [] m_data; + delete [] (char *)m_data; m_size = 0; m_data = (void *)NULL; } @@ -269,11 +439,11 @@ bool wxCustomDataObject::GetDataHere(void *buf) const { void *data = GetData(); if ( !data ) - return FALSE; + return false; memcpy(buf, data, GetSize()); - return TRUE; + return true; } bool wxCustomDataObject::SetData(size_t size, const void *buf) @@ -282,11 +452,11 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf) m_data = Alloc(size); if ( !m_data ) - return FALSE; + return false; memcpy(m_data, buf, m_size = size); - return TRUE; + return true; } // ============================================================================ @@ -301,9 +471,13 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf) // wxTextDropTarget // ---------------------------------------------------------------------------- +// NB: we can't use "new" in ctor initializer lists because this provokes an +// internal compiler error with VC++ 5.0 (hey, even gcc compiles this!), +// so use SetDataObject() instead + wxTextDropTarget::wxTextDropTarget() - : wxDropTarget(new wxTextDataObject) { + SetDataObject(new wxTextDataObject); } wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) @@ -320,8 +494,8 @@ wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) // ---------------------------------------------------------------------------- wxFileDropTarget::wxFileDropTarget() - : wxDropTarget(new wxFileDataObject) { + SetDataObject(new wxFileDataObject); } wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) @@ -333,5 +507,6 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone; } -#endif +#endif // wxUSE_DRAG_AND_DROP +#endif // wxUSE_DATAOBJ