#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 <oleauto.h>
-
-#ifndef __WIN32__
- #include <ole2.h>
- #include <olestd.h>
-#endif
+#include <oleauto.h>
#include <shlobj.h>
#include "wx/msw/ole/oleutils.h"
#define CFSTR_SHELLURL _T("UniformResourceLocator")
#endif
-
// ----------------------------------------------------------------------------
// functions
// ----------------------------------------------------------------------------
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)
};
// ----------------------------------------------------------------------------
wxDataObject *m_pDataObject; // pointer to C++ class we belong to
bool m_mustDelete;
+
+ DECLARE_NO_COPY_CLASS(wxIDataObject)
};
// ============================================================================
wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
{
- m_cRef = 0;
m_nCurrent = 0;
m_nCount = nCount;
m_formats = new CLIPFORMAT[nCount];
wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
{
- m_cRef = 0;
m_pDataObject = pDataObject;
m_mustDelete = FALSE;
}
// 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 )
{
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);
return E_OUTOFMEMORY;
}
- if ( !wxDataFormat(pformatetc->cfFormat).IsStandard() ) {
+ wxDataFormat format = pformatetc->cfFormat;
+ if ( !format.IsStandard() ) {
// 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;
}
// copy data
- void *pBuf = GlobalLock(pmedium->hGlobal);
+ const void *pBuf = GlobalLock(pmedium->hGlobal);
if ( pBuf == NULL ) {
wxLogLastError(wxT("GlobalLock"));
break;
#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
case CF_UNICODETEXT:
-#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
- size = std::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);
+ size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
#endif
break;
#endif
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 -= sizeof(size_t);
+ size -= m_pDataObject->GetBufferOffset( format );
}
}
}
// 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;
// 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;
m_pIDataObject = NULL;
}
+size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
+{
+ return sizeof(size_t);
+}
+
+const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
+ const wxDataFormat& WXUNUSED(format) )
+{
+ size_t* p = (size_t*)buffer;
+ *size = *p;
+
+ return p + 1;
+}
+
+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__
const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
// wxURLDataObject
// ----------------------------------------------------------------------------
+class CFSTR_SHELLURLDataObject : public wxCustomDataObject
+{
+public:
+ CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
+protected:
+ virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
+ {
+ return 0;
+ }
+
+ virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
+ const wxDataFormat& WXUNUSED(format) )
+ {
+ // CFSTR_SHELLURL is _always_ ANSI text
+ *size = strlen( (const char*)buffer );
+
+ return buffer;
+ }
+
+ virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size),
+ const wxDataFormat& WXUNUSED(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, wxConvLibc );
+ 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 provideo ne of them so we have to
+ // but it seems that some browsers only provide one of them so we have to
// support both
- Add(new wxCustomDataObject(CFSTR_SHELLURL));
Add(new wxTextDataObject);
+ Add(new CFSTR_SHELLURLDataObject());
// we don't have any data yet
m_dataObjectLast = NULL;
size_t len = m_dataObjectLast->GetDataSize();
- m_dataObjectLast->GetDataHere(url.GetWriteBuf(len + 1));
+ m_dataObjectLast->GetDataHere(url.GetWriteBuf(len));
url.UngetWriteBuf();
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
// ----------------------------------------------------------------------------
// 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
- DWORD ofs = wxGetNumOfBitmapColors(pbmih->biBitCount) * sizeof(RGBQUAD);
+ DWORD ofs = numColors * sizeof(RGBQUAD);
void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs;
ScreenHDC hdc;
projects / wxWidgets.git / blobdiff