[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index bfb2187205b770196b7427ca12d97094ec782c6e..e0941f626816903b2a1bc69470d28aa81084dd46 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -41,22 +41,18 @@
 // functions
 // ----------------------------------------------------------------------------
 
 // functions
 // ----------------------------------------------------------------------------
 

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

 // ----------------------------------------------------------------------------
 // wxDataFormat
 // ----------------------------------------------------------------------------
 
 wxString wxDataFormat::GetId() const
 {
 // ----------------------------------------------------------------------------
 // wxDataFormat
 // ----------------------------------------------------------------------------
 
 wxString wxDataFormat::GetId() const
 {

-    char                            zBuf[256];
+    wxChar                          zBuf[256];

     wxString                        sRet;
 
     ::WinQueryAtomName( ::WinQuerySystemAtomTable()
                        ,m_uFormat
     wxString                        sRet;
 
     ::WinQueryAtomName( ::WinQuerySystemAtomTable()
                        ,m_uFormat

-                       ,zBuf
+                       ,(PSZ)zBuf

                        ,256
                       );
     sRet = zBuf;
                        ,256
                       );
     sRet = zBuf;


@@ -68,7 +64,7 @@ void wxDataFormat::SetId (
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()

-                             ,zId
+                             ,(PSZ)zId

                             );
 } // end of wxDataFormat::SetId
 
                             );
 } // end of wxDataFormat::SetId
 


@@ -162,7 +158,7 @@ void CIDataObject::SetData (
 , char*                             pzBuffer
 )
 {
 , char*                             pzBuffer
 )
 {

-    ULONG                           ulSize;
+    ULONG                           ulSize = 0;

 
     switch (rFormat.GetType())
     {
 
     switch (rFormat.GetType())
     {


@@ -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:


@@ -263,7 +261,7 @@ bool wxFileDataObject::SetData(
 {
     /* TODO */
 
 {
     /* TODO */
 

-    wxString                        sFile( (const char *)pBuf);  /* char, not wxChar */
+    wxString                        sFile((const wxChar *)pBuf);  /* char, not wxChar */

 
     AddFile(sFile);
 
 
     AddFile(sFile);