HasGroup/Entry added

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

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