X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/269a5a34a6eb0f1eab66c5e09c667b66f0ac90a3..a3ef5bf5045991260005634272633717c0a26174:/src/msw/ole/dataobj.cpp?ds=sidebyside

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index c2d512d673..2d202e39eb 100644
--- 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>
@@ -41,11 +45,7 @@
 // functions
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
-  static const char *GetTymedName(DWORD tymed);
-#else
-  #define GetTymedName(tymed) ""
-#endif
+static const char *GetTymedName(DWORD tymed);
 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation
@@ -280,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;
   }
 }
@@ -355,10 +355,14 @@ wxDataObject::~wxDataObject()
   m_pIDataObject->Release();
 }
 
-#ifdef  __DEBUG__
-
 const char *wxDataObject::GetFormatName(wxDataFormat format)
 {
+#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";
@@ -381,6 +385,14 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
       sprintf(s_szBuf, "clipboard format %d (unknown)", format);
       return s_szBuf;
   }
+
+  #ifdef _MSC_VER
+    #pragma warning(default:4063)
+  #endif // VC++
+
+#else // !Debug
+  return "";
+#endif // Debug
 }
 
 // ----------------------------------------------------------------------------
@@ -403,4 +415,7 @@ static const char *GetTymedName(DWORD tymed)
   }
 }
 
-#endif  //DEBUG
\ No newline at end of file
+// TODO: OLE parts of wxBitmap/File/MetafileDataObject
+
+#endif
+