don't send text changed events from ctor as wxGTK doesn't do it and people apparently...

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 21c81b5bb40673c0c7070c76dd87e40cf85ed9a4..3003abdd38bf4fab236fda378e6b3461222327c8 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -688,7 +688,7 @@ size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
 
 const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
                                             size_t *size,
 
 const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
                                             size_t *size,

-                                            const wxDataFormat& format)
+                                            const wxDataFormat& WXUNUSED(format))

 {
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
 {
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const


@@ -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

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