compilation fix for WXWIN_COMPATIBILITY_2 == 1

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 927950ca11713ff6b71296650cdff1b091d0dfad..6aa1b3976262a4c91b251eb1f0467d3af3ec79fb 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -39,16 +39,12 @@
 
 #include "wx/msw/private.h"         // includes <windows.h>
 
 
 #include "wx/msw/private.h"         // includes <windows.h>
 

-#if wxUSE_NORLANDER_HEADERS
+// for some compilers, the entire ole2.h must be included, not only oleauto.h
+#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)

   #include <ole2.h>
 #endif
   #include <ole2.h>
 #endif

-#include <oleauto.h>
-
-#ifndef __WIN32__
-  #include <ole2.h>
-  #include <olestd.h>
-#endif

 
 

+#include <oleauto.h>

 #include <shlobj.h>
 
 #include "wx/msw/ole/oleutils.h"
 #include <shlobj.h>
 
 #include "wx/msw/ole/oleutils.h"


@@ -91,6 +87,8 @@ private:
     CLIPFORMAT *m_formats;  // formats we can provide data in
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
     CLIPFORMAT *m_formats;  // formats we can provide data in
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position

+
+    DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -125,6 +123,8 @@ private:
     wxDataObject *m_pDataObject;      // pointer to C++ class we belong to
 
     bool m_mustDelete;
     wxDataObject *m_pDataObject;      // pointer to C++ class we belong to
 
     bool m_mustDelete;

+
+    DECLARE_NO_COPY_CLASS(wxIDataObject)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -470,7 +470,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
     || ( defined(__MWERKS__) && defined(__WXMSW__) )
                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else
     || ( defined(__MWERKS__) && defined(__WXMSW__) )
                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else

-                        size = ::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
+                        size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);

 #endif
                         break;
 #endif
 #endif
                         break;
 #endif


@@ -554,7 +554,7 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
     // the only one allowed by current COM implementation
     if ( pformatetc->lindex != -1 ) {
         wxLogTrace(wxTRACE_OleCalls,
     // the only one allowed by current COM implementation
     if ( pformatetc->lindex != -1 ) {
         wxLogTrace(wxTRACE_OleCalls,

-                   wxT("wxIDataObject::QueryGetData: bad lindex %d"),
+                   wxT("wxIDataObject::QueryGetData: bad lindex %ld"),

                    pformatetc->lindex);
 
         return DV_E_LINDEX;
                    pformatetc->lindex);
 
         return DV_E_LINDEX;


@@ -563,7 +563,7 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
     // we don't support anything other (THUMBNAIL, ICON, DOCPRINT...)
     if ( pformatetc->dwAspect != DVASPECT_CONTENT ) {
         wxLogTrace(wxTRACE_OleCalls,
     // we don't support anything other (THUMBNAIL, ICON, DOCPRINT...)
     if ( pformatetc->dwAspect != DVASPECT_CONTENT ) {
         wxLogTrace(wxTRACE_OleCalls,

-                   wxT("wxIDataObject::QueryGetData: bad dwAspect %d"),
+                   wxT("wxIDataObject::QueryGetData: bad dwAspect %ld"),

                    pformatetc->dwAspect);
 
         return DV_E_DVASPECT;
                    pformatetc->dwAspect);
 
         return DV_E_DVASPECT;


@@ -1063,7 +1063,6 @@ bool wxFileDataObject::GetDataHere(void *pData) const
 // wxURLDataObject
 // ----------------------------------------------------------------------------
 
 // wxURLDataObject
 // ----------------------------------------------------------------------------
 

-

 class CFSTR_SHELLURLDataObject : public wxCustomDataObject
 {
 public:
 class CFSTR_SHELLURLDataObject : public wxCustomDataObject
 {
 public:


@@ -1095,7 +1094,7 @@ protected:
         // CFSTR_SHELLURL is _always_ ANSI!
         wxCharBuffer char_buffer( GetDataSize() );
         wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );
         // CFSTR_SHELLURL is _always_ ANSI!
         wxCharBuffer char_buffer( GetDataSize() );
         wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );

-        wxString unicode_buffer( char_buffer );
+        wxString unicode_buffer( char_buffer, wxConvLibc );

         memcpy( buffer, unicode_buffer.c_str(),
                 ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
 
         memcpy( buffer, unicode_buffer.c_str(),
                 ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );