X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9d8273d9c94dc6c098dff2e9495e9336f06dc18..822cf31c2799fc5c68f7ceaabd64f5bc82bf3409:/src/gtk/dataobj.cpp diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 7a61aaa87f..f52cdb4a3d 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -7,15 +7,20 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dataobj.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/dataobj.h" #include "wx/app.h" #include "wx/debug.h" #include "wx/mstream.h" #include "wx/image.h" +#include "wx/log.h" +#include "wx/uri.h" #include @@ -24,6 +29,7 @@ //------------------------------------------------------------------------- GdkAtom g_textAtom = 0; +GdkAtom g_altTextAtom = 0; GdkAtom g_pngAtom = 0; GdkAtom g_fileAtom = 0; @@ -72,10 +78,18 @@ wxDataFormat::wxDataFormat( NativeFormat format ) void wxDataFormat::SetType( wxDataFormatId type ) { PrepareFormats(); + m_type = type; - - if (m_type == wxDF_TEXT) + +#if wxUSE_UNICODE + if (m_type == wxDF_UNICODETEXT) + m_format = g_textAtom; + else if (m_type == wxDF_TEXT) + m_format = g_altTextAtom; +#else + if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT) m_format = g_textAtom; +#endif else if (m_type == wxDF_BITMAP) m_format = g_pngAtom; @@ -95,7 +109,7 @@ wxDataFormatId wxDataFormat::GetType() const wxString wxDataFormat::GetId() const { - wxString ret( gdk_atom_name( m_format ) ); // this will convert from ascii to Unicode + wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) ); return ret; } @@ -105,6 +119,13 @@ void wxDataFormat::SetId( NativeFormat format ) m_format = format; if (m_format == g_textAtom) +#if wxUSE_UNICODE + m_type = wxDF_UNICODETEXT; +#else + m_type = wxDF_TEXT; +#endif + else + if (m_format == g_altTextAtom) m_type = wxDF_TEXT; else if (m_format == g_pngAtom) @@ -121,7 +142,7 @@ void wxDataFormat::SetId( const wxChar *id ) PrepareFormats(); m_type = wxDF_PRIVATE; wxString tmp( id ); - m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for? + m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); } void wxDataFormat::PrepareFormats() @@ -134,7 +155,12 @@ void wxDataFormat::PrepareFormats() // text/uri-list for file dnd because compatibility is not important // here (with whom?) if (!g_textAtom) +#if wxUSE_UNICODE + g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE ); + g_altTextAtom = gdk_atom_intern( "STRING", FALSE ); +#else g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE ); +#endif if (!g_pngAtom) g_pngAtom = gdk_atom_intern( "image/png", FALSE ); if (!g_fileAtom) @@ -149,18 +175,26 @@ wxDataObject::wxDataObject() { } +wxDataObject::~wxDataObject() +{ + // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link +} + 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; } @@ -172,6 +206,18 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) } } +// ---------------------------------------------------------------------------- +// wxTextDataObject +// ---------------------------------------------------------------------------- + +#if defined(__WXGTK20__) && wxUSE_UNICODE +void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const +{ + *formats++ = GetPreferredFormat(); + *formats = g_altTextAtom; +} +#endif + // ---------------------------------------------------------------------------- // wxFileDataObject // ---------------------------------------------------------------------------- @@ -182,8 +228,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const for (size_t i = 0; i < m_filenames.GetCount(); i++) { + filenames += wxT("file:"); filenames += m_filenames[i]; - filenames += (wxChar) 0; + filenames += wxT("\r\n"); } memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 ); @@ -197,8 +244,9 @@ 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 += 1; + res += 5 + 2; // "file:" (5) + "\r\n" (2) } return res + 1; @@ -206,28 +254,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++ ) { @@ -248,7 +278,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) lenPrefix += 2; } - AddFile(filename.c_str() + lenPrefix); + AddFile(wxURI::Unescape(filename.c_str() + lenPrefix)); filename.Empty(); } else @@ -268,7 +298,6 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) filename += *p; } } -#endif // 0/1 return TRUE; } @@ -327,46 +356,44 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) { Clear(); -#if wxUSE_LIBPNG + 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!") ); + m_pngSize = size; m_pngData = malloc(m_pngSize); - memcpy( m_pngData, buf, m_pngSize ); + memcpy(m_pngData, buf, m_pngSize); - wxMemoryInputStream mstream( (char*) m_pngData, m_pngSize ); + wxMemoryInputStream mstream((char*) m_pngData, m_pngSize); wxImage image; - wxPNGHandler handler; - if ( !handler.LoadFile( &image, mstream ) ) + if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) ) { return FALSE; } - m_bitmap = image.ConvertToBitmap(); + m_bitmap = wxBitmap(image); return m_bitmap.Ok(); -#else - return FALSE; -#endif } void wxBitmapDataObject::DoConvertToPng() { -#if wxUSE_LIBPNG - if (!m_bitmap.Ok()) + if ( !m_bitmap.Ok() ) return; - wxImage image( m_bitmap ); - wxPNGHandler handler; + wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, + wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") ); + + wxImage image = m_bitmap.ConvertToImage(); wxCountingOutputStream count; - handler.SaveFile( &image, count ); + image.SaveFile(count, wxBITMAP_TYPE_PNG); m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ??? m_pngData = malloc(m_pngSize); - wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize ); - handler.SaveFile( &image, mstream ); -#endif + wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize); + image.SaveFile(mstream, wxBITMAP_TYPE_PNG); }