!__WX_DC_BLIT_FIXED__ case

[wxWidgets.git] / src / mac / classic / dataobj.cpp

diff --git a/src/mac/classic/dataobj.cpp b/src/mac/classic/dataobj.cpp
index 1e2bd14fd452143aea01750d57299ebe168441ca..3575f7e745613c6f16159124ce15705adea305d0 100644 (file)
--- a/src/mac/classic/dataobj.cpp
+++ b/src/mac/classic/dataobj.cpp
@@ -23,14 +23,15 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/dataobj.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/log.h"
-#include "wx/dataobj.h"
 #include "wx/mstream.h"
-#include "wx/image.h"
 #include "wx/mac/private.h"
 #include <Scrap.h>
 
@@ -170,7 +171,7 @@ bool wxDataObject::IsSupportedFormat(
 
 bool wxFileDataObject::GetDataHere( void* pBuf ) const
 {
-    wxString                        sFilenames;
+    wxString sFilenames;
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
@@ -178,7 +179,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;
 }
 
@@ -188,7 +189,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;
     }