From: Vadim Zeitlin Date: Mon, 21 Jul 2008 03:02:34 +0000 (+0000) Subject: no changes, just fixed a typo in comment X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/27781f63793f6bccf76b95d3b9dcf816ccea88d6?ds=inline no changes, just fixed a typo in comment git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index d0a49bf29a..50ef7fdc80 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -143,7 +143,7 @@ void wxDataFormat::PrepareFormats() { // 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 - // 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 // probably support STRING as well for compatibility anyhow), but use // 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 // the trailing zero (in theory, not for Nautilus in early GNOME // versions). - + m_filenames.Empty(); const gchar *nexttemp = (const gchar*) buf; @@ -276,7 +276,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) nexttemp = temp+len; break; } - + return true; } if (temp[len] == '\r') @@ -289,17 +289,17 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) } len++; } - + if (len == 0) break; - + // required to give it a trailing zero gchar *uri = g_strndup( temp, len ); - + gchar *fn = g_filename_from_uri( uri, NULL, NULL ); - + g_free( uri ); - + if (fn) { AddFile( wxConvFileName->cMB2WX( fn ) ); @@ -415,40 +415,40 @@ wxURLDataObject::wxURLDataObject(const wxString& url) : } size_t wxURLDataObject::GetDataSize() const -{ +{ if (m_url.empty()) return 0; - + return 2*m_url.Len()+2; } 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() ); - + 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 ); - + return true; }