Various changes for Salford C++, and commited fileconf.h/fileconf.cpp changes

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index c2d512d673b6ae57b39391b40a95b44db9073d9d..2d202e39eb7bcd1e55465fab0eb781acfdfe60ad 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>


@@ -41,11 +45,7 @@
 // functions
 // ----------------------------------------------------------------------------
 
 // functions
 // ----------------------------------------------------------------------------
 

-#ifdef  __DEBUG__
-  static const char *GetTymedName(DWORD tymed);
-#else
-  #define GetTymedName(tymed) ""
-#endif
+static const char *GetTymedName(DWORD tymed);

 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation
 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation


@@ -280,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;
   }
 }


@@ -355,10 +355,14 @@ wxDataObject::~wxDataObject()
   m_pIDataObject->Release();
 }
 
   m_pIDataObject->Release();
 }
 

-#ifdef  __DEBUG__
-

 const char *wxDataObject::GetFormatName(wxDataFormat format)
 {
 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";
   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;
   }
       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
+