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

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

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index ff60f14a897643832f1c314547d28c0bf1583d4f..398290e166e4855d9a02f520d23b7a340997d88f 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -137,8 +137,8 @@ bool wxNotebook::Create(
     //
     // Notebook, so explicitly specify 0 as last parameter
     //
     //
     // Notebook, so explicitly specify 0 as last parameter
     //

-    if (!OS2CreateControl( "NOTEBOOK"
-                          ,_T("")
+    if (!OS2CreateControl( wxT("NOTEBOOK")
+                          ,wxEmptyString

                           ,rPos
                           ,rSize
                           ,lStyle | wxTAB_TRAVERSAL
                           ,rPos
                           ,rSize
                           ,lStyle | wxTAB_TRAVERSAL


@@ -280,7 +280,7 @@ wxString wxNotebook::GetPageText (
         return wxEmptyString;
     }
     vBookText.textLen = ulRc + 1; // To get the null terminator
         return wxEmptyString;
     }
     vBookText.textLen = ulRc + 1; // To get the null terminator

-    vBookText.pString = zBuf;
+    vBookText.pString = (char*)zBuf;

 
     //
     // Now get the actual text
 
     //
     // Now get the actual text


@@ -298,7 +298,7 @@ wxString wxNotebook::GetPageText (
         ulRc = 255L;
 
     vBookText.pString[ulRc] = '\0';
         ulRc = 255L;
 
     vBookText.pString[ulRc] = '\0';

-    sStr = vBookText.pString;
+    sStr = (wxChar*)vBookText.pString;

     return sStr;
 } // end of wxNotebook::GetPageText
 
     return sStr;
 } // end of wxNotebook::GetPageText
 


@@ -319,12 +319,12 @@ bool wxNotebook::SetPageImage (
 , int                               nImage
 )
 {
 , int                               nImage
 )
 {

-    wxBitmap*                       pBitmap = (wxBitmap*)m_imageList->GetBitmap(nImage);
+    wxBitmap                        vBitmap = (wxBitmap)m_imageList->GetBitmap(nImage);

 
     return (bool)::WinSendMsg( GetHWND()
                               ,BKM_SETTABBITMAP
                               ,MPFROMLONG((ULONG)m_alPageId[nPage])
 
     return (bool)::WinSendMsg( GetHWND()
                               ,BKM_SETTABBITMAP
                               ,MPFROMLONG((ULONG)m_alPageId[nPage])

-                              ,(MPARAM)pBitmap->GetHBITMAP()
+                              ,(MPARAM)vBitmap.GetHBITMAP()

                              );
 } // end of wxNotebook::SetPageImage
 
                              );
 } // end of wxNotebook::SetPageImage