X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1696b86f89c2f990a7c708064c43f95aa99a5c8..7198c3368055d88249a338eb33b21f051f674806:/src/gtk1/dataobj.cpp?ds=sidebyside diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 84b89dbef6..04fc4a4675 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dataobj.cpp +// Name: src/gtk1/dataobj.cpp // Purpose: wxDataObject class // Author: Robert Roebling // Id: $Id$ @@ -7,19 +7,21 @@ // 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 @@ -28,6 +30,7 @@ //------------------------------------------------------------------------- GdkAtom g_textAtom = 0; +GdkAtom g_altTextAtom = 0; GdkAtom g_pngAtom = 0; GdkAtom g_fileAtom = 0; @@ -55,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 ); @@ -76,14 +73,18 @@ wxDataFormat::wxDataFormat( NativeFormat format ) void wxDataFormat::SetType( wxDataFormatId type ) { PrepareFormats(); - - if (type == wxDF_UNICODETEXT) - type = wxDF_TEXT; 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; @@ -103,7 +104,9 @@ wxDataFormatId wxDataFormat::GetType() const wxString wxDataFormat::GetId() const { - wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) ); + gchar* atom_name = gdk_atom_name( m_format ); + wxString ret = wxString::FromAscii( atom_name ); + g_free(atom_name); return ret; } @@ -113,6 +116,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) @@ -124,12 +134,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() @@ -144,6 +153,7 @@ void wxDataFormat::PrepareFormats() 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 @@ -169,17 +179,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; @@ -207,9 +217,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 @@ -219,7 +229,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) } @@ -228,28 +238,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++ ) { @@ -259,23 +251,23 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) if ( (*p == '\r' && *(p+1) == '\n') || !*p ) { size_t lenPrefix = 5; // strlen("file:") - if ( filename.Left(lenPrefix).MakeLower() == _T("file:") ) + if ( filename.Left(lenPrefix).MakeLower() == wxT("file:") ) { // sometimes the syntax is "file:filename", sometimes it's // URL-like: "file://filename" - deal with both - if ( filename[lenPrefix] == _T('/') && - filename[lenPrefix + 1] == _T('/') ) + if ( filename[lenPrefix] == wxT('/') && + filename[lenPrefix + 1] == wxT('/') ) { // skip the slashes lenPrefix += 2; } - AddFile(filename.c_str() + lenPrefix); + AddFile(wxURI::Unescape(filename.c_str() + lenPrefix)); filename.Empty(); } else { - wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"), + wxLogDebug(wxT("Unsupported URI '%s' in wxFileDataObject"), filename.c_str()); } @@ -290,9 +282,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) filename += *p; } } -#endif // 0/1 - return TRUE; + return true; } void wxFileDataObject::AddFile( const wxString &filename ) @@ -337,12 +328,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) @@ -350,7 +341,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); @@ -361,17 +352,17 @@ 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); - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } void wxBitmapDataObject::DoConvertToPng() { - if ( !m_bitmap.Ok() ) + if ( !m_bitmap.IsOk() ) return; wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, @@ -389,4 +380,4 @@ void wxBitmapDataObject::DoConvertToPng() image.SaveFile(mstream, wxBITMAP_TYPE_PNG); } - +#endif // wxUSE_DATAOBJ