X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd38c87578df7a24a491401c943988e2bc89b62b..2e14066008229145e2da7b9f05a478ce38631f83:/src/motif/dataobj.cpp diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp index 9a21179091..0fd6bf384b 100644 --- a/src/motif/dataobj.cpp +++ b/src/motif/dataobj.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dataobj.cpp +// Name: src/motif/dataobj.cpp // Purpose: wxDataObject class // Author: Julian Smart // Id: $Id$ @@ -7,17 +7,17 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dataobj.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_CLIPBOARD #include "wx/dataobj.h" -#include "wx/app.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -61,12 +61,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type ) SetType( type ); } -wxDataFormat::wxDataFormat( const wxChar *id ) -{ - PrepareFormats(); - SetId( id ); -} - wxDataFormat::wxDataFormat( const wxString &id ) { PrepareFormats(); @@ -107,7 +101,7 @@ wxString wxDataFormat::GetId() const { char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format); wxString ret( t ); // this will convert from ascii to Unicode - if (t) + if (t) XFree( t ); return ret; } @@ -129,23 +123,22 @@ 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 = XInternAtom( wxGlobalDisplay(), - tmp.mbc_str(), FALSE ); + id.mbc_str(), False ); } void wxDataFormat::PrepareFormats() { if (!g_textAtom) - g_textAtom = XInternAtom( wxGlobalDisplay(), "STRING", FALSE ); + g_textAtom = XInternAtom( wxGlobalDisplay(), "STRING", False ); if (!g_bitmapAtom) - g_bitmapAtom = XInternAtom( wxGlobalDisplay(), "PIXMAP", FALSE ); + g_bitmapAtom = XInternAtom( wxGlobalDisplay(), "PIXMAP", False ); if (!g_fileAtom) - g_fileAtom = XInternAtom( wxGlobalDisplay(), "file:ALL", FALSE ); + g_fileAtom = XInternAtom( wxGlobalDisplay(), "file:ALL", False ); } // ---------------------------------------------------------------------------- @@ -167,7 +160,7 @@ size_t wxBitmapDataObject::GetDataSize() const bool wxBitmapDataObject::GetDataHere(void* buf) const { - if( !GetBitmap().Ok() ) + if( !GetBitmap().IsOk() ) return false; (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable();