X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40e1a9c025bc6098fbba2f188ef207cc68c100b3..dcf40a56e7b09fc5472edc1d4471e7954c0da40d:/src/msw/ole/dataobj.cpp diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 708fc1767b..944540a430 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -28,6 +28,10 @@ #pragma hdrstop #endif +#include + +#if defined(__WIN32__) && !defined(__GNUWIN32__) + #include #include #include @@ -276,14 +280,14 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc) } // and now check the type of data requested - if ( m_pDataObject->IsSupportedFormat(pformatetc->cfFormat) ) { + if ( m_pDataObject->IsSupportedFormat((wxDataFormat) pformatetc->cfFormat) ) { wxLogTrace("wxIDataObject::QueryGetData: %s ok", - wxDataObject::GetFormatName(pformatetc->cfFormat)); + wxDataObject::GetFormatName((wxDataFormat) pformatetc->cfFormat)); return S_OK; } else { wxLogTrace("wxIDataObject::QueryGetData: %s unsupported", - wxDataObject::GetFormatName(pformatetc->cfFormat)); + wxDataObject::GetFormatName((wxDataFormat) pformatetc->cfFormat)); return DV_E_FORMATETC; } } @@ -353,7 +357,7 @@ wxDataObject::~wxDataObject() const char *wxDataObject::GetFormatName(wxDataFormat format) { -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ static char s_szBuf[128]; switch ( format ) { case CF_TEXT: return "CF_TEXT"; @@ -400,3 +404,6 @@ static const char *GetTymedName(DWORD tymed) return s_szBuf; } } + +#endif +