Removed rogue AIAI icon; removed PostScript files from Cygwin makefile

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 708fc1767bbd91092c222f91714bccfcbef73fa4..944540a430d418da0fee9dcaba37d1d33b0d04b1 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -28,6 +28,10 @@
   #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>
@@ -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
+