Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comitted GTK part of clipboard patch, that

Browse Source 
enables non-unicode strings to be seen in
    Unicode apps. This is relevant since KDE
    apps paste non-Unicode text.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-03-15 22:46:48 +00:00
parent c19bd0a37a
commit c7d6d88330
8 changed files with 133 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/common/dobjcmn.cpp
View File

@@ -237,42 +237,74 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
// wxTextDataObject
// ----------------------------------------------------------------------------
#if defined(__WXGTK20__) && wxUSE_UNICODE
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;
}
}
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;
}
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;
}
#else
size_t wxTextDataObject::GetDataSize() const
{
#if defined(__WXGTK20__) && wxUSE_UNICODE
// Use UTF8 not UCS4
wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() );
return strlen( (const char*) buffer ) + 1;
#else
return GetTextLength() * sizeof(wxChar);
#endif
}
bool wxTextDataObject::GetDataHere(void *buf) const
{
#if defined(__WXGTK20__) && wxUSE_UNICODE
// Use UTF8 not UCS4
wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() );
strcpy( (char*) buf, (const char*) buffer );
#else
wxStrcpy((wxChar *)buf, GetText().c_str());
#endif
return TRUE;
}
bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
{
#if defined(__WXGTK20__) && wxUSE_UNICODE
// Use UTF8 not UCS4
SetText( wxConvUTF8.cMB2WX( (const char*) buf ) );
#else
SetText(wxString((const wxChar *)buf));
#endif
return TRUE;
}
#endif
// ----------------------------------------------------------------------------
// wxFileDataObjectBase
// ----------------------------------------------------------------------------