Fix wxString unit test when not using UTF-8.

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 540d2330bf565266690ac45022f04d8e4b8ab0ee..b1d1e0e8aa2727b80314a4bb5048284cfdccc17d 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/ole/dataobj.cpp
+// Name:        src/msw/ole/dataobj.cpp

 // Purpose:     implementation of wx[I]DataObject class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wx[I]DataObject class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -465,8 +465,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                         break;
 #if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                     case CF_UNICODETEXT:
                         break;
 #if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                     case CF_UNICODETEXT:

-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) )

                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else
                         size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else
                         size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);


@@ -852,7 +851,7 @@ bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
     wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
     bitmap.SetHBITMAP((WXHBITMAP)hbmp);
 
     wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
     bitmap.SetHBITMAP((WXHBITMAP)hbmp);
 

-    if ( !bitmap.Ok() ) {
+    if ( !bitmap.IsOk() ) {

         wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
 
         return false;
         wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
 
         return false;


@@ -898,7 +897,7 @@ size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const
 bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
                                      void *pBuf) const
 {
 bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
                                      void *pBuf) const
 {

-    wxASSERT_MSG( m_bitmap.Ok(), wxT("copying invalid bitmap") );
+    wxASSERT_MSG( m_bitmap.IsOk(), wxT("copying invalid bitmap") );

 
     HBITMAP hbmp = (HBITMAP)m_bitmap.GetHBITMAP();
     if ( format.GetFormatId() == CF_DIB )
 
     HBITMAP hbmp = (HBITMAP)m_bitmap.GetHBITMAP();
     if ( format.GetFormatId() == CF_DIB )


@@ -977,7 +976,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
 
     m_bitmap.SetHBITMAP((WXHBITMAP)hbmp);
 
 
     m_bitmap.SetHBITMAP((WXHBITMAP)hbmp);
 

-    wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
+    wxASSERT_MSG( m_bitmap.IsOk(), wxT("pasting invalid bitmap") );

 
     return true;
 }
 
     return true;
 }