Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

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;
}