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

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 86cc725f33b0ba8c6d1b66e3f213b8b4f9dfa580..46b88b5eb8b26f47f4dbbf4fe8083246e9dbd309 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -6,7 +6,7 @@
 // Created:     08/08/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -194,7 +194,7 @@ wxBitmap::wxBitmap(
         //
         // We assume that it is in XBM format which is not quite the same as
         // the format CreateBitmap() wants because the order of bytes in the
-        // line is inversed!
+        // line is reversed!
         //
         const size_t                nBytesPerLine = (nWidth + 7) / 8;
         const size_t                nPadding = nBytesPerLine % 2;
@@ -860,7 +860,7 @@ wxImage wxBitmap::ConvertToImage() const
     HBITMAP                         hOldBitmap;
     DEVOPENSTRUC                    vDop  = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
     SIZEL                           vSizlPage = {0,0};
-    HDC                             hDCMem;
+    HDC                             hDCMem = NULLHANDLE;;
 
     vImage.Create( nWidth
                   ,nHeight