X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/810324c83b62b69acbf9861055c5d53de5692c0d..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/dataobj.cpp diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 0602e78037..32288359f1 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dataobj.cpp +// Name: src/gtk/dataobj.cpp // Purpose: wxDataObject class // Author: Robert Roebling // Id: $Id$ @@ -7,21 +7,23 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dataobj.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_DATAOBJ + #include "wx/dataobj.h" -#include "wx/app.h" -#include "wx/debug.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/image.h" +#endif + #include "wx/mstream.h" -#include "wx/image.h" -#include "wx/log.h" +#include "wx/uri.h" -#include +#include "wx/gtk/private.h" //------------------------------------------------------------------------- // global data @@ -56,13 +58,7 @@ wxDataFormat::wxDataFormat( wxDataFormatId type ) SetType( type ); } -wxDataFormat::wxDataFormat( const wxChar *id ) -{ - PrepareFormats(); - SetId( id ); -} - -wxDataFormat::wxDataFormat( const wxString &id ) +void wxDataFormat::InitFromString( const wxString &id ) { PrepareFormats(); SetId( id ); @@ -77,9 +73,9 @@ wxDataFormat::wxDataFormat( NativeFormat format ) void wxDataFormat::SetType( wxDataFormatId type ) { PrepareFormats(); - + m_type = type; - + #if wxUSE_UNICODE if (m_type == wxDF_UNICODETEXT) m_format = g_textAtom; @@ -108,8 +104,8 @@ wxDataFormatId wxDataFormat::GetType() const wxString wxDataFormat::GetId() const { - wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) ); - return ret; + wxGtkString atom_name(gdk_atom_name(m_format)); + return wxString::FromAscii(atom_name); } void wxDataFormat::SetId( NativeFormat format ) @@ -136,12 +132,11 @@ void wxDataFormat::SetId( NativeFormat format ) m_type = wxDF_PRIVATE; } -void wxDataFormat::SetId( const wxChar *id ) +void wxDataFormat::SetId( const wxString& id ) { PrepareFormats(); m_type = wxDF_PRIVATE; - wxString tmp( id ); - m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); + m_format = gdk_atom_intern( id.ToAscii(), FALSE ); } void wxDataFormat::PrepareFormats() @@ -182,17 +177,17 @@ wxDataObject::~wxDataObject() bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const { size_t nFormatCount = GetFormatCount(dir); - if ( nFormatCount == 1 ) + if ( nFormatCount == 1 ) { return format == GetPreferredFormat(); } - else + else { wxDataFormat *formats = new wxDataFormat[nFormatCount]; GetAllFormats(formats,dir); size_t n; - for ( n = 0; n < nFormatCount; n++ ) + for ( n = 0; n < nFormatCount; n++ ) { if ( formats[n] == format ) break; @@ -232,9 +227,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const filenames += wxT("\r\n"); } - memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 ); + memcpy( buf, filenames.mbc_str(), filenames.length() + 1 ); - return TRUE; + return true; } size_t wxFileDataObject::GetDataSize() const @@ -244,7 +239,7 @@ size_t wxFileDataObject::GetDataSize() const for (size_t i = 0; i < m_filenames.GetCount(); i++) { // This is junk in UTF-8 - res += m_filenames[i].Len(); + res += m_filenames[i].length(); res += 5 + 2; // "file:" (5) + "\r\n" (2) } @@ -253,28 +248,10 @@ size_t wxFileDataObject::GetDataSize() const bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) { - // VZ: old format -#if 0 - // filenames are stores as a string with #0 as deliminators - const char *filenames = (const char*) buf; - size_t pos = 0; - for(;;) - { - if (filenames[0] == 0) - break; - if (pos >= size) - break; - wxString file( filenames ); // this returns the first file - AddFile( file ); - pos += file.Len()+1; - filenames += file.Len()+1; - } -#else // 1 m_filenames.Empty(); - // the text/uri-list format is a sequence of URIs (filenames prefixed by - // "file:" as far as I see) delimited by "\r\n" of total length size - // (I wonder what happens if the file has '\n' in its filename??) + // we get data in the text/uri-list format, i.e. as a sequence of URIs + // (filenames prefixed by "file:") delimited by "\r\n" wxString filename; for ( const char *p = (const char *)buf; ; p++ ) { @@ -295,12 +272,17 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) lenPrefix += 2; } - AddFile(filename.c_str() + lenPrefix); + // It would probably be nicer to use a GTK or Glib + // function to unescape the 8-bit strings pointed to + // by buf, but this does the same in wx code. + wxString filename_unicode = wxURI::Unescape(filename.c_str() + lenPrefix); + wxCharBuffer filename_8bit = filename_unicode.mb_str(wxConvISO8859_1); + AddFile(wxString(filename_8bit, *wxConvFileName)); filename.Empty(); } - else + else if ( !filename.empty() ) { - wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"), + wxLogDebug(_T("Unsupported URI \"%s\" in wxFileDataObject"), filename.c_str()); } @@ -312,12 +294,12 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) } else { + // The string is in ISO-8859-1 according to XDND spec filename += *p; } } -#endif // 0/1 - return TRUE; + return true; } void wxFileDataObject::AddFile( const wxString &filename ) @@ -362,12 +344,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const { wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") ); - return FALSE; + return false; } memcpy(buf, m_pngData, m_pngSize); - return TRUE; + return true; } bool wxBitmapDataObject::SetData(size_t size, const void *buf) @@ -375,7 +357,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) Clear(); wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, - FALSE, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); + false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); m_pngSize = size; m_pngData = malloc(m_pngSize); @@ -386,7 +368,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) wxImage image; if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) ) { - return FALSE; + return false; } m_bitmap = wxBitmap(image); @@ -414,4 +396,4 @@ void wxBitmapDataObject::DoConvertToPng() image.SaveFile(mstream, wxBITMAP_TYPE_PNG); } - +#endif // wxUSE_DATAOBJ