X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/269a5a34a6eb0f1eab66c5e09c667b66f0ac90a3..6d8335660f15c5701b922a3f478aab6e6abcc3d4:/src/msw/ole/dataobj.cpp diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index c2d512d673..fd57f7de78 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 @@ -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 @@ -355,10 +355,9 @@ wxDataObject::~wxDataObject() m_pIDataObject->Release(); } -#ifdef __DEBUG__ - const char *wxDataObject::GetFormatName(wxDataFormat format) { +#ifdef __DEBUG__ static char s_szBuf[128]; switch ( format ) { case CF_TEXT: return "CF_TEXT"; @@ -381,6 +380,9 @@ const char *wxDataObject::GetFormatName(wxDataFormat format) sprintf(s_szBuf, "clipboard format %d (unknown)", format); return s_szBuf; } + #else + return ""; +#endif } // ---------------------------------------------------------------------------- @@ -403,4 +405,5 @@ static const char *GetTymedName(DWORD tymed) } } -#endif //DEBUG \ No newline at end of file +#endif +