X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ace90958bccf60ac530ab127573599c78b7c522..47e59154157bb013ce255a4efa7a615574c974f7:/src/x11/dataobj.cpp?ds=sidebyside diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp index 21e8776a29..1f2d5aaf09 100644 --- a/src/x11/dataobj.cpp +++ b/src/x11/dataobj.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dataobj.cpp +// Name: src/x11/dataobj.cpp // Purpose: wxDataObject class // Author: Julian Smart // Id: $Id$ @@ -7,19 +7,22 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "dataobj.h" -#endif +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/defs.h" +#if wxUSE_DATAOBJ #include "wx/dataobj.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/image.h" +#endif + #include "wx/mstream.h" -#include "wx/app.h" -#include "wx/image.h" -#include "wx/log.h" -#include "wx/utils.h" #include "wx/x11/private.h" //------------------------------------------------------------------------- @@ -102,8 +105,8 @@ wxString wxDataFormat::GetId() const return wxEmptyString; #else char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format); - wxString ret( t ); // this will convert from ascii to Unicode - if (t) + wxString ret = wxString::FromAscii( t ); + if (t) XFree( t ); return ret; #endif @@ -132,7 +135,7 @@ void wxDataFormat::SetId( const wxChar *id ) PrepareFormats(); m_type = wxDF_PRIVATE; wxString tmp( id ); - m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for? + m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE ); #endif } @@ -159,17 +162,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; @@ -196,9 +199,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const filenames += (wxChar) 0; } - 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 @@ -207,7 +210,7 @@ size_t wxFileDataObject::GetDataSize() const for (size_t i = 0; i < m_filenames.GetCount(); i++) { - res += m_filenames[i].Len(); + res += m_filenames[i].length(); res += 1; } @@ -229,8 +232,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) break; wxString file( filenames ); // this returns the first file AddFile( file ); - pos += file.Len()+1; - filenames += file.Len()+1; + pos += file.length()+1; + filenames += file.length()+1; } #else // 1 m_filenames.Empty(); @@ -280,7 +283,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) } #endif // 0/1 - return TRUE; + return true; } void wxFileDataObject::AddFile( const wxString &filename ) @@ -325,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) @@ -348,14 +351,14 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) wxPNGHandler handler; if ( !handler.LoadFile( &image, mstream ) ) { - return FALSE; + return false; } - m_bitmap = image.ConvertToBitmap(); + m_bitmap = image; return m_bitmap.Ok(); #else - return FALSE; + return false; #endif } @@ -365,7 +368,7 @@ void wxBitmapDataObject::DoConvertToPng() if (!m_bitmap.Ok()) return; - wxImage image( m_bitmap ); + wxImage image = m_bitmap.ConvertToImage(); wxPNGHandler handler; wxCountingOutputStream count; @@ -379,3 +382,4 @@ void wxBitmapDataObject::DoConvertToPng() #endif } +#endif // wxUSE_DATAOBJ