split wxEVT_GRID_CELL_CHANGE into wxEVT_GRID_CELL_CHANGING/ED pair for consistency...

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index f57954158ad0865adfde8f1e9e71c583ae080b19..ff9169dbe59035158d104a6273762b8a4a8ac12a 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -693,7 +693,7 @@ const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
     const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
     const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,

-                                     wx_const_cast(void*, buffer));
+                                     const_cast<void*>(buffer));

     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error


@@ -1249,11 +1249,15 @@ void wxURLDataObject::SetURL(const wxString& url)
     if ( urlMB )
     {
         const size_t len = strlen(urlMB) + 1; // size with trailing NUL
     if ( urlMB )
     {
         const size_t len = strlen(urlMB) + 1; // size with trailing NUL

+#if !wxUSE_UNICODE

         SetData(wxDF_TEXT, len, urlMB);
         SetData(wxDF_TEXT, len, urlMB);

+#endif

         SetData(wxDataFormat(CFSTR_SHELLURL), len, urlMB);
     }
 
         SetData(wxDataFormat(CFSTR_SHELLURL), len, urlMB);
     }
 

+#if wxUSE_UNICODE

     SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str());
     SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str());

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------