Avoid clash with control container event handlers

[wxWidgets.git] / src / os2 / dataobj.cpp

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 3dfd2b17e5a1ebc14580f2d1752cde35f246a743..81939cf4295c9588cd961e24333e0d2408c258b2 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -22,14 +22,15 @@
 
 #if wxUSE_DATAOBJ
 
 
 #if wxUSE_DATAOBJ
 

+#include "wx/dataobj.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/dataobj.h"

 #include "wx/mstream.h"
 #include "wx/mstream.h"

-#include "wx/image.h"

 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 


@@ -56,11 +57,11 @@ wxString wxDataFormat::GetId() const
 } // end of wxDataFormat::GetId()
 
 void wxDataFormat::SetId (
 } // end of wxDataFormat::GetId()
 
 void wxDataFormat::SetId (

-  const wxChar*                     zId
+  const wxString&                     zId

 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()

-                             ,(PSZ)zId
+                             ,zId.char_str()

                             );
 } // end of wxDataFormat::SetId
 
                             );
 } // end of wxDataFormat::SetId
 


@@ -229,7 +230,7 @@ bool wxFileDataObject::GetDataHere( void* pBuf ) const
         sFilenames += (wxChar)0;
     }
 
         sFilenames += (wxChar)0;
     }
 

-    memcpy(pBuf, sFilenames.mbc_str(), sFilenames.Len() + 1);
+    memcpy(pBuf, sFilenames.mbc_str(), sFilenames.length() + 1);

     return true;
 }
 
     return true;
 }
 


@@ -239,7 +240,7 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {

-        nRes += m_filenames[i].Len();
+        nRes += m_filenames[i].length();

         nRes += 1;
     }
 
         nRes += 1;
     }