]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/ole/dataobj.cpp
Smooth Aqua buttons in wxTreeCtrl.
[wxWidgets.git] / src / msw / ole / dataobj.cpp
index 72e6a05a9ce2fc71ca789e622ee6d01a1fb6e5bc..65151fbf5e73e43dd6906bb44c53f14f98335f2b 100644 (file)
@@ -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"
 
 #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
+#if wxUSE_NORLANDER_HEADERS
   #include <ole2.h>
 #endif
 #include <oleauto.h>
   #include <ole2.h>
 #endif
 #include <oleauto.h>
 
 #include "wx/msw/dib.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) _T("")
 #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;
 
@@ -97,7 +101,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
@@ -133,7 +137,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);
@@ -184,7 +188,7 @@ wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
 
 STDMETHODIMP wxIEnumFORMATETC::Next(ULONG      celt,
                                     FORMATETC *rgelt,
 
 STDMETHODIMP wxIEnumFORMATETC::Next(ULONG      celt,
                                     FORMATETC *rgelt,
-                                    ULONG     *pceltFetched)
+                                    ULONG     *WXUNUSED(pceltFetched))
 {
     wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next"));
 
 {
     wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next"));
 
@@ -297,7 +301,17 @@ 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;
+
         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;
 
@@ -314,12 +328,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 +350,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 +373,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 +392,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;
 
@@ -408,12 +425,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;
@@ -430,9 +447,9 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                 }
 
                 // copy data
                 }
 
                 // 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,9 +466,14 @@ 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 = ::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
+#endif
                         break;
 #endif
                     case CF_BITMAP:
                         break;
 #endif
                     case CF_BITMAP:
@@ -467,12 +489,18 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                         size = 0;
                         break;
 
                         size = 0;
                         break;
 
+                    case CF_METAFILEPICT:
+                        size = sizeof(METAFILEPICT);
+                        break;
+
                     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 +519,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);
@@ -564,7 +602,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 +623,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 +643,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 +685,70 @@ void wxDataObject::SetAutoDelete()
     m_pIDataObject = NULL;
 }
 
     m_pIDataObject = NULL;
 }
 
-bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
+size_t wxDataObject::GetBufferOffset( const wxDataFormat& 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& 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& 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
@@ -722,7 +767,7 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     return wxConvertBitmapToDIB((LPBITMAPINFO)buf, GetBitmap()) != 0;
 }
 
     return wxConvertBitmapToDIB((LPBITMAPINFO)buf, GetBitmap()) != 0;
 }
 
-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));
 
 {
     wxBitmap bitmap(wxConvertDIBToBitmap((const LPBITMAPINFO)buf));
 
@@ -759,14 +804,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 +846,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 +879,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 +888,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 +918,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 +932,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);
@@ -937,8 +982,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
         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);
         }
     }
 
         }
     }
 
@@ -1010,11 +1055,98 @@ 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;
 }
 
+// ----------------------------------------------------------------------------
+// wxURLDataObject
+// ----------------------------------------------------------------------------
+
+class CFSTR_SHELLURLDataObject:public wxCustomDataObject
+{
+public:
+    CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
+protected:
+    virtual size_t GetBufferOffset( const wxDataFormat& format )
+    {
+        return 0;
+    }
+
+    virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
+                                           const wxDataFormat& format )
+    {
+        // CFSTR_SHELLURL is _always_ ANSI text
+        *size = strlen( (const char*)buffer );
+
+        return buffer;
+    }
+
+    virtual void* SetSizeInBuffer( void* buffer, size_t size,
+                                   const wxDataFormat& format )
+    {
+        return buffer;
+    }
+#if wxUSE_UNICODE
+    virtual bool GetDataHere( void* buffer ) const
+    {
+        // CFSTR_SHELLURL is _always_ ANSI!
+        wxCharBuffer char_buffer( GetDataSize() );
+        wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );
+        wxString unicode_buffer( char_buffer );
+        memcpy( buffer, unicode_buffer.c_str(),
+                ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
+
+        return TRUE;
+    }
+#endif
+};
+
+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;
+}
+
+bool wxURLDataObject::SetData(const wxDataFormat& format,
+                              size_t len,
+                              const void *buf)
+{
+    m_dataObjectLast = GetObject(format);
+
+    wxCHECK_MSG( m_dataObjectLast, FALSE,
+                 wxT("unsupported format in wxURLDataObject"));
+
+    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(url.GetWriteBuf(len));
+    url.UngetWriteBuf();
+
+    return url;
+}
+
+void wxURLDataObject::SetURL(const wxString& url)
+{
+    SetData(wxDataFormat(wxDF_TEXT), url.Length()+1, url.c_str());
+    SetData(wxDataFormat(CFSTR_SHELLURL), url.Length()+1, url.c_str());
+}
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
@@ -1061,7 +1193,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap)
     HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP();
     if ( !GetObject(hbmp, sizeof(bm), &bm) )
     {
     HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP();
     if ( !GetObject(hbmp, sizeof(bm), &bm) )
     {
-        wxLogLastError("GetObject(bitmap)");
+        wxLogLastError(wxT("GetObject(bitmap)"));
 
         return 0;
     }
 
         return 0;
     }
@@ -1069,7 +1201,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap)
     // 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;
     // 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);
+    WORD biColors = (WORD)wxGetNumOfBitmapColors(biBits);
 
     BITMAPINFO bi2;
 
 
     BITMAPINFO bi2;
 
@@ -1099,7 +1231,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap)
     ScreenHDC hdc;
     if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) )
     {
     ScreenHDC hdc;
     if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) )
     {
-        wxLogLastError("GetDIBits(NULL)");
+        wxLogLastError(wxT("GetDIBits(NULL)"));
 
         return 0;
     }
 
         return 0;
     }
@@ -1114,7 +1246,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap)
     void *image = (char *)pbi + dwLen;
     if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) )
     {
     void *image = (char *)pbi + dwLen;
     if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) )
     {
-        wxLogLastError("GetDIBits");
+        wxLogLastError(wxT("GetDIBits"));
 
         return 0;
     }
 
         return 0;
     }
@@ -1128,8 +1260,15 @@ wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi)
     // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
     const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader;
 
     // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
     const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader;
 
+    // biClrUsed has the number of colors, unless it's 0
+    int numColors = pbmih->biClrUsed;
+    if (numColors==0)
+    {
+        numColors = wxGetNumOfBitmapColors(pbmih->biBitCount);
+    }
+
     // offset of image from the beginning of the header
     // offset of image from the beginning of the header
-    DWORD ofs = wxGetNumOfBitmapColors(pbmih->biBitCount) * sizeof(RGBQUAD);
+    DWORD ofs = numColors * sizeof(RGBQUAD);
     void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs;
 
     ScreenHDC hdc;
     void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs;
 
     ScreenHDC hdc;
@@ -1137,7 +1276,7 @@ wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi)
                                   image, pbmi, DIB_RGB_COLORS);
     if ( !hbmp )
     {
                                   image, pbmi, DIB_RGB_COLORS);
     if ( !hbmp )
     {
-        wxLogLastError("CreateDIBitmap");
+        wxLogLastError(wxT("CreateDIBitmap"));
     }
 
     wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount);
     }
 
     wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount);
@@ -1160,12 +1299,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