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

no changes, just fixed a typo in comment

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-21 03:02:34 +00:00
parent e2ccb25092
commit 27781f6379
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gtk/dataobj.cpp
View File

@@ -143,7 +143,7 @@ void wxDataFormat::PrepareFormats()
{ {
// VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the // VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the
// atoms STRING and file:ALL as the old code was, but normal X apps // atoms STRING and file:ALL as the old code was, but normal X apps
// use STRING for text selection when transfering the data via // use STRING for text selection when transferring the data via
// clipboard, for example, so do use STRING for now (GNOME apps will // clipboard, for example, so do use STRING for now (GNOME apps will
// probably support STRING as well for compatibility anyhow), but use // probably support STRING as well for compatibility anyhow), but use
// text/uri-list for file dnd because compatibility is not important // text/uri-list for file dnd because compatibility is not important
@@ -258,7 +258,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
// (filenames prefixed by "file:") delimited by "\r\n". size includes // (filenames prefixed by "file:") delimited by "\r\n". size includes
// the trailing zero (in theory, not for Nautilus in early GNOME // the trailing zero (in theory, not for Nautilus in early GNOME
// versions). // versions).
m_filenames.Empty(); m_filenames.Empty();
const gchar *nexttemp = (const gchar*) buf; const gchar *nexttemp = (const gchar*) buf;
@@ -276,7 +276,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
nexttemp = temp+len; nexttemp = temp+len;
break; break;
} }
return true; return true;
} }
if (temp[len] == '\r') if (temp[len] == '\r')
@@ -289,17 +289,17 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
} }
len++; len++;
} }
if (len == 0) if (len == 0)
break; break;
// required to give it a trailing zero // required to give it a trailing zero
gchar *uri = g_strndup( temp, len ); gchar *uri = g_strndup( temp, len );
gchar *fn = g_filename_from_uri( uri, NULL, NULL ); gchar *fn = g_filename_from_uri( uri, NULL, NULL );
g_free( uri ); g_free( uri );
if (fn) if (fn)
{ {
AddFile( wxConvFileName->cMB2WX( fn ) ); AddFile( wxConvFileName->cMB2WX( fn ) );
@@ -415,40 +415,40 @@ wxURLDataObject::wxURLDataObject(const wxString& url) :
} }
size_t wxURLDataObject::GetDataSize() const size_t wxURLDataObject::GetDataSize() const
{ {
if (m_url.empty()) if (m_url.empty())
return 0; return 0;
return 2*m_url.Len()+2; return 2*m_url.Len()+2;
} }
bool wxURLDataObject::GetDataHere(void *buf) const bool wxURLDataObject::GetDataHere(void *buf) const
{ {
if (m_url.empty()) if (m_url.empty())
return false; return false;
wxCSConv conv( "UCS2" ); wxCSConv conv( "UCS2" );
conv.FromWChar( (char*) buf, 2*m_url.Len()+2, m_url.wc_str() ); conv.FromWChar( (char*) buf, 2*m_url.Len()+2, m_url.wc_str() );
return true; return true;
} }
// copy data from buffer to our data // copy data from buffer to our data
bool wxURLDataObject::SetData(size_t len, const void *buf) bool wxURLDataObject::SetData(size_t len, const void *buf)
{ {
if (len == 0) if (len == 0)
{ {
m_url = wxEmptyString; m_url = wxEmptyString;
return false; return false;
} }
wxCSConv conv( "UCS2" ); wxCSConv conv( "UCS2" );
wxWCharBuffer res = conv.cMB2WC( (const char*) buf ); wxWCharBuffer res = conv.cMB2WC( (const char*) buf );
m_url = res; m_url = res;
int pos = m_url.Find( '\n' ); int pos = m_url.Find( '\n' );
if (pos != wxNOT_FOUND) if (pos != wxNOT_FOUND)
m_url.Remove( pos, m_url.Len() - pos ); m_url.Remove( pos, m_url.Len() - pos );
return true; return true;
} }