AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxTextDataObject now uses Unicode if compiled with wxUSE_UNICODE.

Browse Source 
Fixed wxURLDataObject in MSW.
Added GetSizeFromBuffer, SetSizeInBuffer, GetBufferOffset to wxDataObject
 as per Vadim's suggestion.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2001-09-21 00:58:32 +00:00
parent e355628241
commit e1b435afad
4 changed files with 132 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/dataobj.h
View File

@ -273,6 +273,13 @@ public:
protected:
// returns the pointer to the object which supports this format or NULL
wxDataObjectSimple *GetObject(const wxDataFormat& format) const;
#if defined(__WXMSW__)
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
const wxDataFormat& format );
virtual void* SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format );
virtual size_t GetBufferOffset( const wxDataFormat& format );
#endif
private:
// the list of all (simple) data objects whose formats we support
@ -301,7 +308,8 @@ public:
// ctor: you can specify the text here or in SetText(), or override
// GetText()
wxTextDataObject(const wxString& text = wxEmptyString)
: wxDataObjectSimple(wxDF_TEXT), m_text(text)
: wxDataObjectSimple(wxUSE_UNICODE?wxDF_UNICODETEXT:wxDF_TEXT),
m_text(text)
{
}

9
include/wx/msw/ole/dataobj.h
View File

@ -48,7 +48,14 @@ public:
#else // !Debug
#define wxGetFormatName(format) _T("")
#endif // Debug/!Debug
// they need to be accessed from wxIDataObject, so made them public,
// or wxIDataObject friend
public:
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
const wxDataFormat& format );
virtual void* SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format );
virtual size_t GetBufferOffset( const wxDataFormat& format );
private:
IDataObject *m_pIDataObject; // pointer to the COM interface
};

43
src/common/dobjcmn.cpp
View File

@ -133,6 +133,43 @@ 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, FALSE,
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, FALSE,
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, FALSE,
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?
@ -190,19 +227,19 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
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;
}
bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
{
SetText(wxString((const char *)buf));
SetText(wxString((const wxChar *)buf));
return TRUE;
}

91
src/msw/ole/dataobj.cpp
View File

@ -59,7 +59,6 @@
#define CFSTR_SHELLURL _T("UniformResourceLocator")
#endif
// ----------------------------------------------------------------------------
// functions
// ----------------------------------------------------------------------------
@ -329,7 +328,9 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
if ( !format.IsStandard() ) {
// for custom formats, put the size with the data - alloc the
// space for it
size += sizeof(size_t);
// MB: not completely sure this is correct,
// even if I can't figure out what's wrong
size += m_pDataObject->GetBufferOffset( format );
}
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
@ -391,14 +392,12 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc,
return E_OUTOFMEMORY;
}
if ( !wxDataFormat(pformatetc->cfFormat).IsStandard() ) {
wxDataFormat format = pformatetc->cfFormat;
if ( !format.IsStandard() ) {
// for custom formats, put the size with the data
size_t *p = (size_t *)pBuf;
*p++ = GlobalSize(hGlobal);
pBuf = p;
pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format );
}
wxDataFormat format = pformatetc->cfFormat;
if ( !m_pDataObject->GetDataHere(format, pBuf) )
return E_UNEXPECTED;
@ -448,7 +447,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
}
// copy data
void *pBuf = GlobalLock(pmedium->hGlobal);
const void *pBuf = GlobalLock(pmedium->hGlobal);
if ( pBuf == NULL ) {
wxLogLastError(wxT("GlobalLock"));
@ -470,9 +469,9 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
case CF_UNICODETEXT:
#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
size = std::wcslen((const wchar_t *)pBuf);
size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
#else
size = ::wcslen((const wchar_t *)pBuf);
size = ::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
#endif
break;
#endif
@ -496,12 +495,10 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
default:
{
// we suppose that the size precedes the data
size_t *p = (size_t *)pBuf;
size = *p++;
pBuf = p;
pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
if (! format.IsStandard() ) {
// see GetData for coresponding increment
size -= sizeof(size_t);
size -= m_pDataObject->GetBufferOffset( format );
}
}
}
@ -687,6 +684,29 @@ void wxDataObject::SetAutoDelete()
m_pIDataObject = NULL;
}
size_t wxDataObject::GetBufferOffset( const wxDataFormat& format )
{
return sizeof(size_t);
}
const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
const wxDataFormat& format )
{
size_t* p = (size_t*)buffer;
*size = *p;
return p + 1;
}
void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format )
{
size_t* p = (size_t*)buffer;
*p = size;
return p + 1;
}
#ifdef __WXDEBUG__
const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
@ -1044,12 +1064,51 @@ bool wxFileDataObject::GetDataHere(void *pData) const
// wxURLDataObject
// ----------------------------------------------------------------------------
class CFSTR_SHELLURLDataObject:public wxCustomDataObject
{
public:
CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
protected:
virtual size_t GetBufferOffset( const wxDataFormat& format )
{
return 0;
}
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
const wxDataFormat& format )
{
// CFSTR_SHELLURL is _always_ ANSI text
*size = strlen( (const char*)buffer );
return buffer;
}
virtual void* SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format )
{
return buffer;
}
#if wxUSE_UNICODE
virtual bool GetDataHere( void* buffer ) const
{
// CFSTR_SHELLURL is _always_ ANSI!
wxCharBuffer char_buffer( GetDataSize() );
wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );
wxString unicode_buffer( char_buffer );
memcpy( buffer, unicode_buffer.c_str(),
( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
return TRUE;
}
#endif
};
wxURLDataObject::wxURLDataObject()
{
// we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
// but it seems that some browsers only provideo ne of them so we have to
// but it seems that some browsers only provide one of them so we have to
// support both
Add(new wxCustomDataObject(CFSTR_SHELLURL));
Add(new CFSTR_SHELLURLDataObject());
Add(new wxTextDataObject);
// we don't have any data yet