X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7520f3da332d64a676b6f7d27a56004fabf2db36..fc2d42090058bb7ebb9545b857a9a435ecbdd876:/src/x11/dataobj.cpp diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp index 4fee19a527..1f2d5aaf09 100644 --- a/src/x11/dataobj.cpp +++ b/src/x11/dataobj.cpp @@ -13,12 +13,16 @@ #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" //------------------------------------------------------------------------- @@ -195,7 +199,7 @@ 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; } @@ -206,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; } @@ -228,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();