projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added an error message if a bitmap can't be addedto the image list
[wxWidgets.git]
/
src
/
msw
/
ole
/
dataobj.cpp
diff --git
a/src/msw/ole/dataobj.cpp
b/src/msw/ole/dataobj.cpp
index 708fc1767bbd91092c222f91714bccfcbef73fa4..2718e36bbe214cd65cbd9486cfdf913613cb4476 100644
(file)
--- a/
src/msw/ole/dataobj.cpp
+++ b/
src/msw/ole/dataobj.cpp
@@
-28,6
+28,10
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#include <wx/defs.h>
+
+#if defined(__WIN32__) && !defined(__GNUWIN32__)
+
#include <wx/log.h>
#include <wx/msw/ole/oleutils.h>
#include <wx/msw/ole/dataobj.h>
#include <wx/log.h>
#include <wx/msw/ole/oleutils.h>
#include <wx/msw/ole/dataobj.h>
@@
-276,14
+280,14
@@
STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
}
// and now check the type of data requested
}
// 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",
wxLogTrace("wxIDataObject::QueryGetData: %s ok",
- wxDataObject::GetFormatName(pformatetc->cfFormat));
+ wxDataObject::GetFormatName(
(wxDataFormat)
pformatetc->cfFormat));
return S_OK;
}
else {
wxLogTrace("wxIDataObject::QueryGetData: %s unsupported",
return S_OK;
}
else {
wxLogTrace("wxIDataObject::QueryGetData: %s unsupported",
- wxDataObject::GetFormatName(pformatetc->cfFormat));
+ wxDataObject::GetFormatName(
(wxDataFormat)
pformatetc->cfFormat));
return DV_E_FORMATETC;
}
}
return DV_E_FORMATETC;
}
}
@@
-353,7
+357,12
@@
wxDataObject::~wxDataObject()
const char *wxDataObject::GetFormatName(wxDataFormat format)
{
const char *wxDataObject::GetFormatName(wxDataFormat format)
{
-#ifdef __DEBUG__
+#ifdef __WXDEBUG__
+ // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
+ #ifdef _MSC_VER
+ #pragma warning(disable:4063)
+ #endif // VC++
+
static char s_szBuf[128];
switch ( format ) {
case CF_TEXT: return "CF_TEXT";
static char s_szBuf[128];
switch ( format ) {
case CF_TEXT: return "CF_TEXT";
@@
-376,9
+385,14
@@
const char *wxDataObject::GetFormatName(wxDataFormat format)
sprintf(s_szBuf, "clipboard format %d (unknown)", format);
return s_szBuf;
}
sprintf(s_szBuf, "clipboard format %d (unknown)", format);
return s_szBuf;
}
- #else
+
+ #ifdef _MSC_VER
+ #pragma warning(default:4063)
+ #endif // VC++
+
+#else // !Debug
return "";
return "";
-#endif
+#endif
// Debug
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-400,3
+414,6
@@
static const char *GetTymedName(DWORD tymed)
return s_szBuf;
}
}
return s_szBuf;
}
}
+
+#endif
+