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

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

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 3d18ef8976cdd22aafde66f297ebb28a910c5ffa..ed401f97db67a139d73dfbffc3f2a87e2335ac1d 100644 (file)
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -97,8 +97,6 @@ bool wxStaticBitmap::Create(
 
     int                             nX= rPos.x;
     int                             nY = rPos.y;
 
     int                             nX= rPos.x;
     int                             nY = rPos.y;

-    int                             nWidth = rSize.x;
-    int                             nHeight = rSize.y;

     char                            zId[16];
 
     m_windowStyle = lStyle;
     char                            zId[16];
 
     m_windowStyle = lStyle;


@@ -111,7 +109,7 @@ bool wxStaticBitmap::Create(
     int                             nWinstyle = SS_ICON;
 
     m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()
     int                             nWinstyle = SS_ICON;
 
     m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()

-                                       ,wxCanvasClassName
+                                       ,(PSZ)wxCanvasClassName

                                        ,zId
                                        ,nWinstyle | WS_VISIBLE
                                        ,0,0,0,0
                                        ,zId
                                        ,nWinstyle | WS_VISIBLE
                                        ,0,0,0,0


@@ -164,7 +162,6 @@ void wxStaticBitmap::OnPaint (
 )
 {
     wxPaintDC                       vDc(this);
 )
 {
     wxPaintDC                       vDc(this);

-    int                             i;

     wxBitmap*                       pBitmap;
 
     if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))
     wxBitmap*                       pBitmap;
 
     if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))