fixed crash on startup under GTK

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 72e6a05a9ce2fc71ca789e622ee6d01a1fb6e5bc..6a4ef3067093f861ca6eaf076866bf11a0d1e41d 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dataobj.h"
 #endif
 
     #pragma implementation "dataobj.h"
 #endif
 


@@ -28,8 +28,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WIN32__) && !defined(__GNUWIN32_OLD__)
-

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -37,24 +35,30 @@
 
 #include "wx/dataobj.h"
 
 
 #include "wx/dataobj.h"
 

+#if wxUSE_OLE && defined(__WIN32__) && !defined(__GNUWIN32_OLD__)
+

 #include "wx/msw/private.h"         // includes <windows.h>
 
 #include "wx/msw/private.h"         // includes <windows.h>
 

-#ifdef wxUSE_NORLANDER_HEADERS
-  #include <ole2.h>
+#ifdef __WXWINCE__
+#include <winreg.h>

 #endif
 #endif

-#include <oleauto.h>

 
 

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

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

-  #include <olestd.h>

 #endif
 
 #endif
 

+#include <oleauto.h>

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

+#ifndef CFSTR_SHELLURL
+#define CFSTR_SHELLURL _T("UniformResourceLocator")
+#endif
+

 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------


@@ -62,7 +66,7 @@
 #ifdef __WXDEBUG__
     static const wxChar *GetTymedName(DWORD tymed);
 #else // !Debug
 #ifdef __WXDEBUG__
     static const wxChar *GetTymedName(DWORD tymed);
 #else // !Debug

-    #define GetTymedName(tymed) ""
+    #define GetTymedName(tymed) wxEmptyString

 #endif // Debug/!Debug
 
 // ----------------------------------------------------------------------------
 #endif // Debug/!Debug
 
 // ----------------------------------------------------------------------------


@@ -73,7 +77,7 @@ class wxIEnumFORMATETC : public IEnumFORMATETC
 {
 public:
     wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
 {
 public:
     wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);

-    ~wxIEnumFORMATETC() { delete [] m_formats; }
+    virtual ~wxIEnumFORMATETC() { delete [] m_formats; }

 
     DECLARE_IUNKNOWN_METHODS;
 
 
     DECLARE_IUNKNOWN_METHODS;
 


@@ -87,6 +91,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)

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


@@ -97,7 +103,7 @@ class wxIDataObject : public IDataObject
 {
 public:
     wxIDataObject(wxDataObject *pDataObject);
 {
 public:
     wxIDataObject(wxDataObject *pDataObject);

-    ~wxIDataObject();
+    virtual ~wxIDataObject();

 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     // is), but in some cases, the situation is inversed, that is we delete it
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     // is), but in some cases, the situation is inversed, that is we delete it


@@ -121,6 +127,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)

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


@@ -133,7 +141,7 @@ private:
 
 void wxDataFormat::SetId(const wxChar *format)
 {
 
 void wxDataFormat::SetId(const wxChar *format)
 {

-    m_format = ::RegisterClipboardFormat(format);
+    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);

     if ( !m_format )
     {
         wxLogError(_("Couldn't register clipboard format '%s'."), format);
     if ( !m_format )
     {
         wxLogError(_("Couldn't register clipboard format '%s'."), format);


@@ -149,8 +157,7 @@ wxString wxDataFormat::GetId() const
     wxCHECK_MSG( !IsStandard(), s,
                  wxT("name of predefined format cannot be retrieved") );
 
     wxCHECK_MSG( !IsStandard(), s,
                  wxT("name of predefined format cannot be retrieved") );
 

-    int len = ::GetClipboardFormatName(m_format, s.GetWriteBuf(max), max);
-    s.UngetWriteBuf();
+    int len = ::GetClipboardFormatName(m_format, wxStringBuffer(s, max), max);

 
     if ( !len )
     {
 
     if ( !len )
     {


@@ -173,7 +180,6 @@ IMPLEMENT_IUNKNOWN_METHODS(wxIEnumFORMATETC)
 
 wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
 {
 
 wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
 {

-    m_cRef = 0;

     m_nCurrent = 0;
     m_nCount = nCount;
     m_formats = new CLIPFORMAT[nCount];
     m_nCurrent = 0;
     m_nCount = nCount;
     m_formats = new CLIPFORMAT[nCount];


@@ -188,27 +194,23 @@ STDMETHODIMP wxIEnumFORMATETC::Next(ULONG      celt,
 {
     wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next"));
 
 {
     wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next"));
 

-    if ( celt > 1 ) {
-        // we only return 1 element at a time - mainly because I'm too lazy to
-        // implement something which you're never asked for anyhow
-        return S_FALSE;
-    }
-
-    if ( m_nCurrent < m_nCount ) {
+    ULONG numFetched = 0;
+    while (m_nCurrent < m_nCount && numFetched < celt) {

         FORMATETC format;
         format.cfFormat = m_formats[m_nCurrent++];
         format.ptd      = NULL;
         format.dwAspect = DVASPECT_CONTENT;
         format.lindex   = -1;
         format.tymed    = TYMED_HGLOBAL;
         FORMATETC format;
         format.cfFormat = m_formats[m_nCurrent++];
         format.ptd      = NULL;
         format.dwAspect = DVASPECT_CONTENT;
         format.lindex   = -1;
         format.tymed    = TYMED_HGLOBAL;

-        *rgelt = format;

 
 

-        return S_OK;
-    }
-    else {
-        // bad index
-        return S_FALSE;
+        *rgelt++ = format;
+        numFetched++;

     }
     }

+
+    if (pceltFetched)
+        *pceltFetched = numFetched;
+
+    return numFetched == celt ? S_OK : S_FALSE;

 }
 
 STDMETHODIMP wxIEnumFORMATETC::Skip(ULONG celt)
 }
 
 STDMETHODIMP wxIEnumFORMATETC::Skip(ULONG celt)


@@ -264,7 +266,6 @@ IMPLEMENT_IUNKNOWN_METHODS(wxIDataObject)
 
 wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
 {
 
 wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
 {

-    m_cRef = 0;

     m_pDataObject = pDataObject;
     m_mustDelete = FALSE;
 }
     m_pDataObject = pDataObject;
     m_mustDelete = FALSE;
 }


@@ -289,7 +290,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
 
     // for the bitmaps and metafiles we use the handles instead of global memory
     // to pass the data
 
     // for the bitmaps and metafiles we use the handles instead of global memory
     // to pass the data

-    wxDataFormat format = (wxDataFormatId)pformatetcIn->cfFormat;
+    wxDataFormat format = (wxDataFormat::NativeFormat)pformatetcIn->cfFormat;

 
     switch ( format )
     {
 
     switch ( format )
     {


@@ -297,10 +298,21 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
             pmedium->tymed = TYMED_GDI;
             break;
 
             pmedium->tymed = TYMED_GDI;
             break;
 

+        case wxDF_ENHMETAFILE:
+            pmedium->tymed = TYMED_ENHMF;
+            break;
+
+#ifndef __WXWINCE__

         case wxDF_METAFILE:
         case wxDF_METAFILE:

+            pmedium->hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE,
+                                           sizeof(METAFILEPICT));
+            if ( !pmedium->hGlobal ) {
+                wxLogLastError(wxT("GlobalAlloc"));
+                return E_OUTOFMEMORY;
+            }

             pmedium->tymed = TYMED_MFPICT;
             break;
             pmedium->tymed = TYMED_MFPICT;
             break;

-
+#endif

         default:
             // alloc memory
             size_t size = m_pDataObject->GetDataSize(format);
         default:
             // alloc memory
             size_t size = m_pDataObject->GetDataSize(format);


@@ -314,12 +326,14 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
             if ( !format.IsStandard() ) {
                 // for custom formats, put the size with the data - alloc the
                 // space for it
             if ( !format.IsStandard() ) {
                 // for custom formats, put the size with the data - alloc the
                 // space for it

-                size += sizeof(size_t);
+                // MB: not completely sure this is correct,
+                //     even if I can't figure out what's wrong
+                size += m_pDataObject->GetBufferOffset( format );

             }
 
             HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
             if ( hGlobal == NULL ) {
             }
 
             HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
             if ( hGlobal == NULL ) {

-                wxLogLastError("GlobalAlloc");
+                wxLogLastError(wxT("GlobalAlloc"));

                 return E_OUTOFMEMORY;
             }
 
                 return E_OUTOFMEMORY;
             }
 


@@ -334,7 +348,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
     hr = GetDataHere(pformatetcIn, pmedium);
     if ( FAILED(hr) ) {
         // free resources we allocated
     hr = GetDataHere(pformatetcIn, pmedium);
     if ( FAILED(hr) ) {
         // free resources we allocated

-        if ( pmedium->tymed == TYMED_HGLOBAL ) {
+        if ( pmedium->tymed & (TYMED_HGLOBAL | TYMED_MFPICT) ) {

             GlobalFree(pmedium->hGlobal);
         }
 
             GlobalFree(pmedium->hGlobal);
         }
 


@@ -357,12 +371,15 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc,
                 return E_UNEXPECTED;
             break;
 
                 return E_UNEXPECTED;
             break;
 

-        case TYMED_MFPICT:
-            // this should be copied on bitmaps - but I don't have time for
-            // this now
-            wxFAIL_MSG(wxT("TODO - no support for metafiles in wxDataObject"));
+        case TYMED_ENHMF:
+            if ( !m_pDataObject->GetDataHere(wxDF_ENHMETAFILE,
+                                             &pmedium->hEnhMetaFile) )
+                return E_UNEXPECTED;

             break;
 
             break;
 

+        case TYMED_MFPICT:
+            // fall through - we pass METAFILEPICT through HGLOBAL
+

         case TYMED_HGLOBAL:
             {
                 // copy data
         case TYMED_HGLOBAL:
             {
                 // copy data


@@ -373,14 +390,12 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc,
                     return E_OUTOFMEMORY;
                 }
 
                     return E_OUTOFMEMORY;
                 }
 

-                if ( !wxDataFormat(pformatetc->cfFormat).IsStandard() ) {
+                wxDataFormat format = pformatetc->cfFormat;
+                if ( !format.IsStandard() ) {

                     // for custom formats, put the size with the data
                     // for custom formats, put the size with the data

-                    size_t *p = (size_t *)pBuf;
-                    *p++ = GlobalSize(hGlobal);
-                    pBuf = p;
+                    pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format );

                 }
 
                 }
 

-                wxDataFormat format = pformatetc->cfFormat;

                 if ( !m_pDataObject->GetDataHere(format, pBuf) )
                     return E_UNEXPECTED;
 
                 if ( !m_pDataObject->GetDataHere(format, pBuf) )
                     return E_UNEXPECTED;
 


@@ -395,6 +410,7 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc,
     return S_OK;
 }
 
     return S_OK;
 }
 

+

 // set data functions
 STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                                     STGMEDIUM *pmedium,
 // set data functions
 STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                                     STGMEDIUM *pmedium,


@@ -408,12 +424,12 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
             m_pDataObject->SetData(wxDF_BITMAP, 0, &pmedium->hBitmap);
             break;
 
             m_pDataObject->SetData(wxDF_BITMAP, 0, &pmedium->hBitmap);
             break;
 

-        case TYMED_MFPICT:
-            // this should be copied on bitmaps - but I don't have time for
-            // this now
-            wxFAIL_MSG(wxT("TODO - no support for metafiles in wxDataObject"));
+        case TYMED_ENHMF:
+            m_pDataObject->SetData(wxDF_ENHMETAFILE, 0, &pmedium->hEnhMetaFile);

             break;
 
             break;
 

+        case TYMED_MFPICT:
+            // fall through - we pass METAFILEPICT through HGLOBAL

         case TYMED_HGLOBAL:
             {
                 wxDataFormat format = pformatetc->cfFormat;
         case TYMED_HGLOBAL:
             {
                 wxDataFormat format = pformatetc->cfFormat;


@@ -424,15 +440,15 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                 // as we can't fix this bug in explorer (it's a bug because it
                 // should only use formats returned by EnumFormatEtc), do the
                 // check here
                 // as we can't fix this bug in explorer (it's a bug because it
                 // should only use formats returned by EnumFormatEtc), do the
                 // check here

-                if ( !m_pDataObject->IsSupportedFormat(format) ) {
+                if ( !m_pDataObject->IsSupported(format, wxDataObject::Set) ) {

                     // go away!
                     return DV_E_FORMATETC;
                 }
 
                 // copy data
                     // go away!
                     return DV_E_FORMATETC;
                 }
 
                 // copy data

-                void *pBuf = GlobalLock(pmedium->hGlobal);
+                const void *pBuf = GlobalLock(pmedium->hGlobal);

                 if ( pBuf == NULL ) {
                 if ( pBuf == NULL ) {

-                    wxLogLastError("GlobalLock");
+                    wxLogLastError(wxT("GlobalLock"));

 
                     return E_OUTOFMEMORY;
                 }
 
                     return E_OUTOFMEMORY;
                 }


@@ -449,17 +465,24 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                     case CF_OEMTEXT:
                         size = strlen((const char *)pBuf);
                         break;
                     case CF_OEMTEXT:
                         size = strlen((const char *)pBuf);
                         break;

-#ifndef __WATCOMC__
+#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))

                     case CF_UNICODETEXT:
                     case CF_UNICODETEXT:

-                        size = wcslen((const wchar_t *)pBuf);
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+                        size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
+#else
+                        size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
+#endif

                         break;
 #endif
                     case CF_BITMAP:
                         break;
 #endif
                     case CF_BITMAP:

+#ifndef __WXWINCE__

                     case CF_HDROP:
                         // these formats don't use size at all, anyhow (but
                         // pass data by handle, which is always a single DWORD)
                         size = 0;
                         break;
                     case CF_HDROP:
                         // these formats don't use size at all, anyhow (but
                         // pass data by handle, which is always a single DWORD)
                         size = 0;
                         break;

+#endif

 
                     case CF_DIB:
                         // the handler will calculate size itself (it's too
 
                     case CF_DIB:
                         // the handler will calculate size itself (it's too


@@ -467,12 +490,19 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                         size = 0;
                         break;
 
                         size = 0;
                         break;
 

+#ifndef __WXWINCE__
+                    case CF_METAFILEPICT:
+                        size = sizeof(METAFILEPICT);
+                        break;
+#endif

                     default:
                         {
                             // we suppose that the size precedes the data
                     default:
                         {
                             // we suppose that the size precedes the data

-                            size_t *p = (size_t *)pBuf;
-                            size = *p++;
-                            pBuf = p;
+                            pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
+                            if (! format.IsStandard() ) {
+                                // see GetData for coresponding increment
+                                size -= m_pDataObject->GetBufferOffset( format  );
+                            }

                         }
                 }
 
                         }
                 }
 


@@ -491,11 +521,21 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
     }
 
     if ( fRelease ) {
     }
 
     if ( fRelease ) {

-        // we own the medium, so we must release it - but do *not* free the
-        // bitmap handle fi we have it because we have copied it elsewhere
-        if ( pmedium->tymed == TYMED_GDI )
+        // we own the medium, so we must release it - but do *not* free any
+        // data we pass by handle because we have copied it elsewhere
+        switch ( pmedium->tymed )

         {
         {

-            pmedium->hBitmap = 0;
+            case TYMED_GDI:
+                pmedium->hBitmap = 0;
+                break;
+
+            case TYMED_MFPICT:
+                pmedium->hMetaFilePict = 0;
+                break;
+
+            case TYMED_ENHMF:
+                pmedium->hEnhMetaFile = 0;
+                break;

         }
 
         ReleaseStgMedium(pmedium);
         }
 
         ReleaseStgMedium(pmedium);


@@ -518,7 +558,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;


@@ -527,7 +567,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;


@@ -564,7 +604,7 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
     return S_OK;
 }
 
     return S_OK;
 }
 

-STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *pFormatetcIn,
+STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *WXUNUSED(pFormatetcIn),

                                                   FORMATETC *pFormatetcOut)
 {
     wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::GetCanonicalFormatEtc"));
                                                   FORMATETC *pFormatetcOut)
 {
     wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::GetCanonicalFormatEtc"));


@@ -585,7 +625,8 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir,
                                                        : wxDataObject::Set;
 
     size_t nFormatCount = m_pDataObject->GetFormatCount(dir);
                                                        : wxDataObject::Set;
 
     size_t nFormatCount = m_pDataObject->GetFormatCount(dir);

-    wxDataFormat format, *formats;
+    wxDataFormat format;
+    wxDataFormat *formats;

     formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
     m_pDataObject->GetAllFormats(formats, dir);
 
     formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
     m_pDataObject->GetAllFormats(formats, dir);
 


@@ -604,20 +645,20 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir,
 // advise sink functions (not implemented)
 // ----------------------------------------------------------------------------
 
 // advise sink functions (not implemented)
 // ----------------------------------------------------------------------------
 

-STDMETHODIMP wxIDataObject::DAdvise(FORMATETC   *pformatetc,
-                                    DWORD        advf,
-                                    IAdviseSink *pAdvSink,
-                                    DWORD       *pdwConnection)
+STDMETHODIMP wxIDataObject::DAdvise(FORMATETC   *WXUNUSED(pformatetc),
+                                    DWORD        WXUNUSED(advf),
+                                    IAdviseSink *WXUNUSED(pAdvSink),
+                                    DWORD       *WXUNUSED(pdwConnection))

 {
   return OLE_E_ADVISENOTSUPPORTED;
 }
 
 {
   return OLE_E_ADVISENOTSUPPORTED;
 }
 

-STDMETHODIMP wxIDataObject::DUnadvise(DWORD dwConnection)
+STDMETHODIMP wxIDataObject::DUnadvise(DWORD WXUNUSED(dwConnection))

 {
   return OLE_E_ADVISENOTSUPPORTED;
 }
 
 {
   return OLE_E_ADVISENOTSUPPORTED;
 }
 

-STDMETHODIMP wxIDataObject::EnumDAdvise(IEnumSTATDATA **ppenumAdvise)
+STDMETHODIMP wxIDataObject::EnumDAdvise(IEnumSTATDATA **WXUNUSED(ppenumAdvise))

 {
   return OLE_E_ADVISENOTSUPPORTED;
 }
 {
   return OLE_E_ADVISENOTSUPPORTED;
 }


@@ -646,64 +687,70 @@ void wxDataObject::SetAutoDelete()
     m_pIDataObject = NULL;
 }
 
     m_pIDataObject = NULL;
 }
 

-bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
+size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) )

 {
 {

-    size_t nFormatCount = GetFormatCount();
-    if ( nFormatCount == 1 ) {
-        return format == GetPreferredFormat();
-    }
-    else {
-        wxDataFormat *formats = new wxDataFormat[nFormatCount];
-        GetAllFormats(formats);
+    return sizeof(size_t);
+}

 
 

-        size_t n;
-        for ( n = 0; n < nFormatCount; n++ ) {
-            if ( formats[n] == format )
-                break;
-        }
+const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
+                                             const wxDataFormat& WXUNUSED(format) )
+{
+    size_t* p = (size_t*)buffer;
+    *size = *p;

 
 

-        delete [] formats;
+    return p + 1;
+}

 
 

-        // found?
-        return n < nFormatCount;
-    }
+void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
+                                       const wxDataFormat& WXUNUSED(format) )
+{
+    size_t* p = (size_t*)buffer;
+    *p = size;
+
+    return p + 1;

 }
 
 #ifdef __WXDEBUG__
 
 }
 
 #ifdef __WXDEBUG__
 

-const char *wxDataObject::GetFormatName(wxDataFormat format)
+const wxChar *wxDataObject::GetFormatName(wxDataFormat format)

 {
 {

-  // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
-  #ifdef __VISUALC__
-    #pragma warning(disable:4063)
-  #endif // VC++
-
-  static char s_szBuf[128];
-  switch ( format ) {
-    case CF_TEXT:         return "CF_TEXT";
-    case CF_BITMAP:       return "CF_BITMAP";
-    case CF_METAFILEPICT: return "CF_METAFILEPICT";
-    case CF_SYLK:         return "CF_SYLK";
-    case CF_DIF:          return "CF_DIF";
-    case CF_TIFF:         return "CF_TIFF";
-    case CF_OEMTEXT:      return "CF_OEMTEXT";
-    case CF_DIB:          return "CF_DIB";
-    case CF_PALETTE:      return "CF_PALETTE";
-    case CF_PENDATA:      return "CF_PENDATA";
-    case CF_RIFF:         return "CF_RIFF";
-    case CF_WAVE:         return "CF_WAVE";
-    case CF_UNICODETEXT:  return "CF_UNICODETEXT";
-    case CF_ENHMETAFILE:  return "CF_ENHMETAFILE";
-    case CF_HDROP:        return "CF_HDROP";
-    case CF_LOCALE:       return "CF_LOCALE";
-    default:
-      sprintf(s_szBuf, "clipboard format 0x%x (unknown)", format);
-      return s_szBuf;
-  }
-
-  #ifdef __VISUALC__
-    #pragma warning(default:4063)
-  #endif // VC++
+    // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
+    #ifdef __VISUALC__
+        #pragma warning(disable:4063)
+    #endif // VC++
+
+    static wxChar s_szBuf[256];
+    switch ( format ) {
+        case CF_TEXT:         return wxT("CF_TEXT");
+        case CF_BITMAP:       return wxT("CF_BITMAP");
+        case CF_METAFILEPICT: return wxT("CF_METAFILEPICT");
+        case CF_SYLK:         return wxT("CF_SYLK");
+        case CF_DIF:          return wxT("CF_DIF");
+        case CF_TIFF:         return wxT("CF_TIFF");
+        case CF_OEMTEXT:      return wxT("CF_OEMTEXT");
+        case CF_DIB:          return wxT("CF_DIB");
+        case CF_PALETTE:      return wxT("CF_PALETTE");
+        case CF_PENDATA:      return wxT("CF_PENDATA");
+        case CF_RIFF:         return wxT("CF_RIFF");
+        case CF_WAVE:         return wxT("CF_WAVE");
+        case CF_UNICODETEXT:  return wxT("CF_UNICODETEXT");
+        case CF_ENHMETAFILE:  return wxT("CF_ENHMETAFILE");
+        case CF_HDROP:        return wxT("CF_HDROP");
+        case CF_LOCALE:       return wxT("CF_LOCALE");
+
+        default:
+            if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) )
+            {
+                // it must be a new predefined format we don't know the name of
+                wxSprintf(s_szBuf, wxT("unknown CF (0x%04x)"), format.GetFormatId());
+            }
+
+            return s_szBuf;
+    }
+
+    #ifdef __VISUALC__
+        #pragma warning(default:4063)
+    #endif // VC++

 }
 
 #endif // Debug
 }
 
 #endif // Debug


@@ -714,27 +761,45 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
 
 size_t wxBitmapDataObject::GetDataSize() const
 {
 
 size_t wxBitmapDataObject::GetDataSize() const
 {

-    return wxConvertBitmapToDIB(NULL, GetBitmap());
+#if wxUSE_WXDIB
+    return wxDIB::ConvertFromBitmap(NULL, GetHbitmapOf(GetBitmap()));
+#else
+    return 0;
+#endif

 }
 
 bool wxBitmapDataObject::GetDataHere(void *buf) const
 {
 }
 
 bool wxBitmapDataObject::GetDataHere(void *buf) const
 {

-    return wxConvertBitmapToDIB((LPBITMAPINFO)buf, GetBitmap()) != 0;
+#if wxUSE_WXDIB
+    BITMAPINFO * const pbi = (BITMAPINFO *)buf;
+
+    return wxDIB::ConvertFromBitmap(pbi, GetHbitmapOf(GetBitmap())) != 0;
+#else
+    return FALSE;
+#endif

 }
 
 }
 

-bool wxBitmapDataObject::SetData(size_t len, const void *buf)
+bool wxBitmapDataObject::SetData(size_t WXUNUSED(len), const void *buf)

 {
 {

-    wxBitmap bitmap(wxConvertDIBToBitmap((const LPBITMAPINFO)buf));
+#if wxUSE_WXDIB
+    const BITMAPINFO * const pbmi = (const BITMAPINFO *)buf;

 
 

-    if ( !bitmap.Ok() ) {
-        wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
+    HBITMAP hbmp = wxDIB::ConvertToBitmap(pbmi);

 
 

-        return FALSE;
-    }
+    wxCHECK_MSG( hbmp, FALSE, wxT("pasting/dropping invalid bitmap") );
+
+    const BITMAPINFOHEADER * const pbmih = &pbmi->bmiHeader;
+    wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount);
+    bitmap.SetHBITMAP((WXHBITMAP)hbmp);
+
+    // TODO: create wxPalette if the bitmap has any

 
     SetBitmap(bitmap);
 
     return TRUE;
 
     SetBitmap(bitmap);
 
     return TRUE;

+#else
+    return FALSE;
+#endif

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


@@ -759,14 +824,14 @@ bool wxBitmapDataObject2::GetDataHere(void *pBuf) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxBitmapDataObject2::SetData(size_t len, const void *pBuf)
+bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)

 {
     HBITMAP hbmp = *(HBITMAP *)pBuf;
 
     BITMAP bmp;
     if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
     {
 {
     HBITMAP hbmp = *(HBITMAP *)pBuf;
 
     BITMAP bmp;
     if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
     {

-        wxLogLastError("GetObject(HBITMAP)");
+        wxLogLastError(wxT("GetObject(HBITMAP)"));

     }
 
     wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
     }
 
     wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);


@@ -801,7 +866,7 @@ size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const
         if ( !GetDIBits(hdc, (HBITMAP)m_bitmap.GetHBITMAP(), 0, 0,
                         NULL, &bi, DIB_RGB_COLORS) )
         {
         if ( !GetDIBits(hdc, (HBITMAP)m_bitmap.GetHBITMAP(), 0, 0,
                         NULL, &bi, DIB_RGB_COLORS) )
         {

-            wxLogLastError("GetDIBits(NULL)");
+            wxLogLastError(wxT("GetDIBits(NULL)"));

 
             return 0;
         }
 
             return 0;
         }


@@ -834,7 +899,7 @@ bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
         BITMAPINFO *pbi = (BITMAPINFO *)pBuf;
         if ( !GetDIBits(hdc, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) )
         {
         BITMAPINFO *pbi = (BITMAPINFO *)pBuf;
         if ( !GetDIBits(hdc, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) )
         {

-            wxLogLastError("GetDIBits(NULL)");
+            wxLogLastError(wxT("GetDIBits(NULL)"));

 
             return 0;
         }
 
             return 0;
         }


@@ -843,7 +908,7 @@ bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
         if ( !GetDIBits(hdc, hbmp, 0, pbi->bmiHeader.biHeight, pbi + 1,
                         pbi, DIB_RGB_COLORS) )
         {
         if ( !GetDIBits(hdc, hbmp, 0, pbi->bmiHeader.biHeight, pbi + 1,
                         pbi, DIB_RGB_COLORS) )
         {

-            wxLogLastError("GetDIBits");
+            wxLogLastError(wxT("GetDIBits"));

 
             return FALSE;
         }
 
             return FALSE;
         }


@@ -873,7 +938,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
                               pbmi + 1, pbmi, DIB_RGB_COLORS);
         if ( !hbmp )
         {
                               pbmi + 1, pbmi, DIB_RGB_COLORS);
         if ( !hbmp )
         {

-            wxLogLastError("CreateDIBitmap");
+            wxLogLastError(wxT("CreateDIBitmap"));

         }
 
         m_bitmap.SetWidth(pbmih->biWidth);
         }
 
         m_bitmap.SetWidth(pbmih->biWidth);


@@ -887,7 +952,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
         BITMAP bmp;
         if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
         {
         BITMAP bmp;
         if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
         {

-            wxLogLastError("GetObject(HBITMAP)");
+            wxLogLastError(wxT("GetObject(HBITMAP)"));

         }
 
         m_bitmap.SetWidth(bmp.bmWidth);
         }
 
         m_bitmap.SetWidth(bmp.bmWidth);


@@ -910,6 +975,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
 {
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
 {

+#ifndef __WXWINCE__

     m_filenames.Empty();
 
     // the documentation states that the first member of DROPFILES structure is
     m_filenames.Empty();
 
     // the documentation states that the first member of DROPFILES structure is


@@ -932,17 +998,19 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
         // +1 for terminating NUL
         len = ::DragQueryFile(hdrop, n, NULL, 0) + 1;
 
         // +1 for terminating NUL
         len = ::DragQueryFile(hdrop, n, NULL, 0) + 1;
 

-        UINT len2 = ::DragQueryFile(hdrop, n, str.GetWriteBuf(len), len);
-        str.UngetWriteBuf();
+        UINT len2 = ::DragQueryFile(hdrop, n, wxStringBuffer(str, len), len);

         m_filenames.Add(str);
 
         if ( len2 != len - 1 ) {
         m_filenames.Add(str);
 
         if ( len2 != len - 1 ) {

-            wxLogDebug(wxT("In wxFileDropTarget::OnDrop DragQueryFile returned"
-                           " %d characters, %d expected."), len2, len - 1);
+            wxLogDebug(wxT("In wxFileDropTarget::OnDrop DragQueryFile returned\
+ %d characters, %d expected."), len2, len - 1);

         }
     }
 
     return TRUE;
         }
     }
 
     return TRUE;

+#else
+    return FALSE;
+#endif

 }
 
 void wxFileDataObject::AddFile(const wxString& file)
 }
 
 void wxFileDataObject::AddFile(const wxString& file)


@@ -955,6 +1023,7 @@ void wxFileDataObject::AddFile(const wxString& file)
 
 size_t wxFileDataObject::GetDataSize() const
 {
 
 size_t wxFileDataObject::GetDataSize() const
 {

+#ifndef __WXWINCE__

     // size returned will be the size of the DROPFILES structure,
     // plus the list of filesnames (null byte separated), plus
     // a double null at the end
     // size returned will be the size of the DROPFILES structure,
     // plus the list of filesnames (null byte separated), plus
     // a double null at the end


@@ -974,10 +1043,14 @@ size_t wxFileDataObject::GetDataSize() const
     }
 
     return sz;
     }
 
     return sz;

+#else
+    return 0;
+#endif

 }
 
 bool wxFileDataObject::GetDataHere(void *pData) const
 {
 }
 
 bool wxFileDataObject::GetDataHere(void *pData) const
 {

+#ifndef __WXWINCE__

     // pData points to an externally allocated memory block
     // created using the size returned by GetDataSize()
 
     // pData points to an externally allocated memory block
     // created using the size returned by GetDataSize()
 


@@ -1010,142 +1083,117 @@ bool wxFileDataObject::GetDataHere(void *pData) const
         *pbuf++ = wxT('\0');
     }
 
         *pbuf++ = wxT('\0');
     }
 

-    *pbuf = wxT('\0'); // add final null terminator
+    // add final null terminator
+    *pbuf = wxT('\0');

 
     return TRUE;
 
     return TRUE;

+#else
+    return FALSE;
+#endif

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

-// private functions
+// wxURLDataObject

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-static size_t wxGetNumOfBitmapColors(size_t bitsPerPixel)
+class CFSTR_SHELLURLDataObject : public wxCustomDataObject

 {
 {

-    switch ( bitsPerPixel )
+public:
+    CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
+protected:
+    virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) )

     {
     {

-        case 1:
-            // monochrome bitmap, 2 entries
-            return 2;
-
-        case 4:
-            return 16;
-
-        case 8:
-            return 256;
-
-        case 24:
-            // may be used with 24bit bitmaps, but we don't use it here - fall
-            // through
-
-        case 16:
-        case 32:
-            // bmiColors not used at all with these bitmaps
-            return 0;
-
-        default:
-            wxFAIL_MSG( wxT("unknown bitmap format") );
-            return 0;
+        return 0;

     }
     }

-}
-
-size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap)
-{
-    wxASSERT_MSG( bitmap.Ok(), wxT("invalid bmp can't be converted to DIB") );
-
-    // shouldn't be selected into a DC or GetDIBits() would fail
-    wxASSERT_MSG( !bitmap.GetSelectedInto(),
-                  wxT("can't copy bitmap selected into wxMemoryDC") );

 
 

-    // prepare all the info we need
-    BITMAP bm;
-    HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP();
-    if ( !GetObject(hbmp, sizeof(bm), &bm) )
+    virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
+                                           const wxDataFormat& WXUNUSED(format) )

     {
     {

-        wxLogLastError("GetObject(bitmap)");
+        // CFSTR_SHELLURL is _always_ ANSI text
+        *size = strlen( (const char*)buffer );

 
 

-        return 0;
+        return buffer;

     }
 
     }
 

-    // calculate the number of bits per pixel and the number of items in
-    // bmiColors array (whose meaning depends on the bitmap format)
-    WORD biBits = bm.bmPlanes * bm.bmBitsPixel;
-    WORD biColors = wxGetNumOfBitmapColors(biBits);
-
-    BITMAPINFO bi2;
-
-    bool wantSizeOnly = pbi == NULL;
-    if ( wantSizeOnly )
-        pbi = &bi2;
-
-    // just for convenience
-    BITMAPINFOHEADER& bi = pbi->bmiHeader;
-
-    bi.biSize = sizeof(BITMAPINFOHEADER);
-    bi.biWidth = bm.bmWidth;
-    bi.biHeight = bm.bmHeight;
-    bi.biPlanes = 1;
-    bi.biBitCount = biBits;
-    bi.biCompression = BI_RGB;
-    bi.biSizeImage = 0;
-    bi.biXPelsPerMeter = 0;
-    bi.biYPelsPerMeter = 0;
-    bi.biClrUsed = 0;
-    bi.biClrImportant = 0;
-
-    // memory we need for BITMAPINFO only
-    DWORD dwLen = bi.biSize + biColors * sizeof(RGBQUAD);
-
-    // first get the image size
-    ScreenHDC hdc;
-    if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) )
+    virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size),
+                                   const wxDataFormat& WXUNUSED(format) )

     {
     {

-        wxLogLastError("GetDIBits(NULL)");
-
-        return 0;
+        return buffer;

     }
 
     }
 

-    if ( wantSizeOnly )
+#if wxUSE_UNICODE
+    virtual bool GetDataHere( void* buffer ) const

     {
     {

-        // size of the header + size of the image
-        return dwLen + bi.biSizeImage;
+        // CFSTR_SHELLURL is _always_ ANSI!
+        wxCharBuffer char_buffer( GetDataSize() );
+        wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );
+        wxString unicode_buffer( char_buffer, wxConvLibc );
+        memcpy( buffer, unicode_buffer.c_str(),
+                ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
+
+        return TRUE;

     }
     }

+    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+                             void *buf) const
+        { return GetDataHere(buf); }
+#endif
+
+    DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
+};

 
 

-    // and now copy the bits
-    void *image = (char *)pbi + dwLen;
-    if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) )
-    {
-        wxLogLastError("GetDIBits");

 
 

-        return 0;
-    }

 
 

-    return dwLen + bi.biSizeImage;
+wxURLDataObject::wxURLDataObject()
+{
+    // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
+    // but it seems that some browsers only provide one of them so we have to
+    // support both
+    Add(new wxTextDataObject);
+    Add(new CFSTR_SHELLURLDataObject());
+
+    // we don't have any data yet
+    m_dataObjectLast = NULL;

 }
 
 }
 

-wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi)
+bool wxURLDataObject::SetData(const wxDataFormat& format,
+                              size_t len,
+                              const void *buf)

 {
 {

-    // here we get BITMAPINFO struct followed by the actual bitmap bits and
-    // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
-    const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader;
-
-    // offset of image from the beginning of the header
-    DWORD ofs = wxGetNumOfBitmapColors(pbmih->biBitCount) * sizeof(RGBQUAD);
-    void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs;
-
-    ScreenHDC hdc;
-    HBITMAP hbmp = CreateDIBitmap(hdc, pbmih, CBM_INIT,
-                                  image, pbmi, DIB_RGB_COLORS);
-    if ( !hbmp )
-    {
-        wxLogLastError("CreateDIBitmap");
-    }
+    m_dataObjectLast = GetObject(format);

 
 

-    wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount);
-    bitmap.SetHBITMAP((WXHBITMAP)hbmp);
+    wxCHECK_MSG( m_dataObjectLast, FALSE,
+                 wxT("unsupported format in wxURLDataObject"));

 
 

-    return bitmap;
+    return m_dataObjectLast->SetData(len, buf);

 }
 
 }
 

+wxString wxURLDataObject::GetURL() const
+{
+    wxString url;
+    wxCHECK_MSG( m_dataObjectLast, url, _T("no data in wxURLDataObject") );
+
+    size_t len = m_dataObjectLast->GetDataSize();
+
+    m_dataObjectLast->GetDataHere(wxStringBuffer(url, len));
+
+    return url;
+}
+
+void wxURLDataObject::SetURL(const wxString& url)
+{
+    SetData(wxDataFormat(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT),
+            url.Length()+1, url.c_str());
+
+    // CFSTR_SHELLURL is always supposed to be ANSI...
+    wxWX2MBbuf urlA = (wxWX2MBbuf)url.mbc_str();
+    size_t len = strlen(urlA);
+    SetData(wxDataFormat(CFSTR_SHELLURL), len+1, (const char*)urlA);
+}
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+

 #ifdef __WXDEBUG__
 
 static const wxChar *GetTymedName(DWORD tymed)
 #ifdef __WXDEBUG__
 
 static const wxChar *GetTymedName(DWORD tymed)


@@ -1160,12 +1208,36 @@ static const wxChar *GetTymedName(DWORD tymed)
         case TYMED_MFPICT:    return wxT("TYMED_MFPICT");
         case TYMED_ENHMF:     return wxT("TYMED_ENHMF");
         default:
         case TYMED_MFPICT:    return wxT("TYMED_MFPICT");
         case TYMED_ENHMF:     return wxT("TYMED_ENHMF");
         default:

-            wxSprintf(s_szBuf, wxT("type of media format %d (unknown)"), tymed);
+            wxSprintf(s_szBuf, wxT("type of media format %ld (unknown)"), tymed);

             return s_szBuf;
     }
 }
 
 #endif // Debug
 
             return s_szBuf;
     }
 }
 
 #endif // Debug
 

-#endif // not using OLE at all
+#else // not using OLE at all
+// ----------------------------------------------------------------------------
+// wxDataObject
+// ----------------------------------------------------------------------------
+
+wxDataObject::wxDataObject()
+{
+}
+
+wxDataObject::~wxDataObject()
+{
+}
+
+void wxDataObject::SetAutoDelete()
+{
+}
+
+#ifdef __WXDEBUG__
+const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
+{
+    return NULL;
+}
+#endif
+
+#endif