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

Use text/uri-list instead of x-moz-url in wxGTK wxURLDataObject.

Browse Source 
The standard exchange format for URLs is text/uri-list and not the deprecated
and Firefox-specific x-moz-url, support for which was moreover implemented
incorrectly anyhow.

Also add an example of copying URLs to the dnd sample.

See https://developer.mozilla.org/En/DragDrop/Recommended_Drag_Types for more
information.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-20 11:55:00 +00:00
parent ee5cc6302e
commit 62490e9ea7
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gtk/dataobj.cpp
View File

@@ -421,45 +421,26 @@ void wxBitmapDataObject::DoConvertToPng()
// ----------------------------------------------------------------------------
wxURLDataObject::wxURLDataObject(const wxString& url) :
wxDataObjectSimple( wxDataFormat( gdk_atom_intern("text/x-moz-url",FALSE) ) )
wxDataObjectSimple( wxDataFormat( g_fileAtom ) )
{
m_url = url;
}
size_t wxURLDataObject::GetDataSize() const
{
if (m_url.empty())
return 0;
return 2*m_url.Len()+2;
return strlen(m_url.utf8_str()) + 1;
}
bool wxURLDataObject::GetDataHere(void *buf) const
{
if (m_url.empty())
return false;
wxCSConv conv( "UCS2" );
conv.FromWChar( (char*) buf, 2*m_url.Len()+2, m_url.wc_str() );
strcpy(static_cast<char*>(buf), m_url.utf8_str());
return true;
}
// copy data from buffer to our data
bool wxURLDataObject::SetData(size_t len, const void *buf)
{
if (len == 0)
{
m_url = wxEmptyString;
return false;
}
wxCSConv conv( "UCS2" );
wxWCharBuffer res = conv.cMB2WC( (const char*) buf );
m_url = res;
int pos = m_url.Find( '\n' );
if (pos != wxNOT_FOUND)
m_url.Remove( pos, m_url.Len() - pos );
m_url = wxString::FromUTF8(static_cast<const char*>(buf), len);
return true;
}