X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb7d73757f9e8771e7d8fc6b22f1acf27aac35bd..d07f2e19181bc5caf29eb2338ce513be6fa42405:/src/os2/dataobj.cpp

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 137101f053..be55a32aef 100644
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -20,17 +20,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_DATAOBJ
+
+#include "wx/dataobj.h"
+
 #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"
 
@@ -57,11 +57,11 @@ wxString wxDataFormat::GetId() const
 } // end of wxDataFormat::GetId()
 
 void wxDataFormat::SetId (
-  const wxChar*                     zId
+  const wxString&                     zId
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
-                             ,(PSZ)zId
+                             ,zId.char_str()
                             );
 } // end of wxDataFormat::SetId
 
@@ -230,7 +230,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 +240,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;
     }
 
@@ -329,12 +329,12 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void* pBuf)
     m_bitmap = wxBitmap(vImage);
 #endif //wxUSE_STREAMS
 
-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
-    if (!m_bitmap.Ok())
+    if (!m_bitmap.IsOk())
         return;
 
 #if wxUSE_STREAMS