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

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 5e2ed33694f245e22181a3e82abf5f047ec5ca69..95c5e30a56cb63157adeb0004ae4bb96ea5ba544 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -81,7 +81,7 @@ bool wxMemoryDC::CreateCompatible(
             m_ok = TRUE;
             m_bOwnsDC = TRUE;
             //
-            // Set the wxWindows color table
+            // Set the wxWidgets color table
             //
             ::GpiCreateLogColorTable( m_hPS
                                      ,0L
@@ -153,9 +153,10 @@ void wxMemoryDC::SelectObject(
         //
         // Bmps drawn to are upside down, so flip it before committing
         //
-        POINTL                      vPoint[4] = { 0, m_vSelectedBitmap.GetHeight(),
-                                                  m_vSelectedBitmap.GetWidth(), 0,
-                                                  0, 0, m_vSelectedBitmap.GetWidth(), m_vSelectedBitmap.GetHeight()
+        POINTL                      vPoint[4] = { {0, m_vSelectedBitmap.GetHeight()}
+                                                 ,{m_vSelectedBitmap.GetWidth(), 0}
+                                                 ,{0, 0}
+                                                 ,{m_vSelectedBitmap.GetWidth(), m_vSelectedBitmap.GetHeight()}
                                                 };