No real changes, just use wxString::clear() instead of assignment.

[wxWidgets.git] / src / msw / ole / dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index c479a2c9abab395c165c0f45a92b4154572681f8..2c2c44603f67033e73129ec36cbe03f10e10c634 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -930,7 +930,7 @@ void wxDataObject::SetAutoDelete()
     ((wxIDataObject *)m_pIDataObject)->SetDeleteFlag();
     m_pIDataObject->Release();
 
-    // so that the dtor doesnt' crash
+    // so that the dtor doesn't crash
     m_pIDataObject = NULL;
 }
 
@@ -1306,7 +1306,7 @@ size_t wxFileDataObject::GetDataSize() const
     if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
     {
         // Win9x always uses ANSI file names and MSLU doesn't help with this
-        sizeOfChar = sizeof(char);
+        sizeOfChar = 1;
     }
     else
     {
@@ -1316,7 +1316,7 @@ size_t wxFileDataObject::GetDataSize() const
     static const size_t sizeOfChar = sizeof(wxChar);
 #endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU
 
-    // inital size of DROPFILES struct + null byte
+    // initial size of DROPFILES struct + null byte
     size_t sz = sizeof(DROPFILES) + sizeOfChar;
 
     const size_t count = m_filenames.size();
@@ -1325,7 +1325,7 @@ size_t wxFileDataObject::GetDataSize() const
         // add filename length plus null byte
         size_t len;
 #if wxUSE_UNICODE_MSLU
-        if ( sizeOfChar == sizeof(char) )
+        if ( sizeOfChar == 1 )
             len = strlen(m_filenames[i].mb_str(*wxConvFileName));
         else
 #endif // wxUSE_UNICODE_MSLU
@@ -1362,7 +1362,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
     pDrop->fWide = wxUSE_UNICODE;
 #endif
 
-    const size_t sizeOfChar = pDrop->fWide ? sizeof(wchar_t) : sizeof(char);
+    const size_t sizeOfChar = pDrop->fWide ? sizeof(wchar_t) : 1;
 
     // set start of filenames list (null separated)
     BYTE *pbuf = (BYTE *)(pDrop + 1);
@@ -1373,7 +1373,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
         // copy filename to pbuf and add null terminator
         size_t len;
 #if wxUSE_UNICODE_MSLU
-        if ( sizeOfChar == sizeof(char) )
+        if ( sizeOfChar == 1 )
         {
             wxCharBuffer buf(m_filenames[i].mb_str(*wxConvFileName));
             len = strlen(buf);