X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb7d73757f9e8771e7d8fc6b22f1acf27aac35bd..cd05bf23f6aec29f60a793f3ca4dfe336661fca1:/src/os2/dataobj.cpp diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp index 137101f053..c07595d156 100644 --- a/src/os2/dataobj.cpp +++ b/src/os2/dataobj.cpp @@ -20,17 +20,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_DATAOBJ + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/image.h" #endif -#if wxUSE_DATAOBJ - #include "wx/dataobj.h" #include "wx/mstream.h" -#include "wx/image.h" #include "wx/os2/private.h" @@ -230,7 +229,7 @@ bool wxFileDataObject::GetDataHere( void* pBuf ) const sFilenames += (wxChar)0; } - memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1); + memcpy(pBuf, sFilenames.mbc_str(), sFilenames.length() + 1); return true; } @@ -240,7 +239,7 @@ size_t wxFileDataObject::GetDataSize() const for (size_t i = 0; i < m_filenames.GetCount(); i++) { - nRes += m_filenames[i].Len(); + nRes += m_filenames[i].length(); nRes += 1; }