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

DnD with Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-24 16:00:28 +00:00
parent 434d2cb3c6
commit b03b33e2e6
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/dataobj.cpp
View File

@@ -341,7 +341,7 @@ size_t wxTextDataObject::GetSize() const
void wxTextDataObject::WriteString( const wxString &str, void *dest ) const
{
memcpy( dest, m_data.c_str(), GetSize() );
memcpy( dest, m_data.mbc_str(), GetSize() );
}
// ----------------------------------------------------------------------------
@@ -368,7 +368,7 @@ wxString wxFileDataObject::GetFiles() const
void wxFileDataObject::WriteData( void *dest ) const
{
memcpy( dest, m_files.c_str(), GetSize() );
memcpy( dest, m_files.mbc_str(), GetSize() );
}
size_t wxFileDataObject::GetSize() const

3
src/gtk/dnd.cpp
View File

@@ -470,7 +470,7 @@ bool wxTextDropTarget::OnData( int x, int y )
wxTextDataObject data;
if (!GetData( &data )) return FALSE;
OnDropText( x, y, data.GetText().mbc_str() );
OnDropText( x, y, data.GetText() );
return TRUE;
}
@@ -591,6 +591,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
if (data_object->GetFormat().GetAtom() == selection_data->target)
{
size_t data_size = data_object->GetSize();
if (data_size > 0)
{
guchar *buffer = new guchar[data_size];

4
src/gtk1/dataobj.cpp
View File

@@ -341,7 +341,7 @@ size_t wxTextDataObject::GetSize() const
void wxTextDataObject::WriteString( const wxString &str, void *dest ) const
{
memcpy( dest, m_data.c_str(), GetSize() );
memcpy( dest, m_data.mbc_str(), GetSize() );
}
// ----------------------------------------------------------------------------
@@ -368,7 +368,7 @@ wxString wxFileDataObject::GetFiles() const
void wxFileDataObject::WriteData( void *dest ) const
{
memcpy( dest, m_files.c_str(), GetSize() );
memcpy( dest, m_files.mbc_str(), GetSize() );
}
size_t wxFileDataObject::GetSize() const

3
src/gtk1/dnd.cpp
View File

@@ -470,7 +470,7 @@ bool wxTextDropTarget::OnData( int x, int y )
wxTextDataObject data;
if (!GetData( &data )) return FALSE;
OnDropText( x, y, data.GetText().mbc_str() );
OnDropText( x, y, data.GetText() );
return TRUE;
}
@@ -591,6 +591,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
if (data_object->GetFormat().GetAtom() == selection_data->target)
{
size_t data_size = data_object->GetSize();
if (data_size > 0)
{
guchar *buffer = new guchar[data_size];