renamed errcode to fix compilation with VC++ 8 (replaces patch 982303)

[wxWidgets.git] / src / os2 / dataobj.cpp

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 5ec5bb269d4ac0db1f4f2e12da699b18d1d85c61..9c94fc10e44fd812d2f3bc6cd85e2df799fc65dc 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -41,10 +41,6 @@
 // functions
 // ----------------------------------------------------------------------------
 
 // functions
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
-    static const wxChar *GetTymedName(DWORD tymed);
-#endif // Debug
-

 // ----------------------------------------------------------------------------
 // wxDataFormat
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataFormat
 // ----------------------------------------------------------------------------


@@ -173,9 +169,11 @@ void CIDataObject::SetData (
             ulSize = strlen((const char *)pzBuffer);
             break;
 
             ulSize = strlen((const char *)pzBuffer);
             break;
 

+#if wxUSE_UNICODE

         case wxDF_UNICODETEXT:
              ulSize = ::wcslen((const wchar_t *)pzBuffer);
              break;
         case wxDF_UNICODETEXT:
              ulSize = ::wcslen((const wchar_t *)pzBuffer);
              break;

+#endif

 
         case wxDF_BITMAP:
         case wxDF_METAFILE:
 
         case wxDF_BITMAP:
         case wxDF_METAFILE: