Correctly bracketed initializers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index b3532167a849955e8831bec9e636ec81b4d98cfe..dfdcab5f4cbc6468e83ee28f1525b522ce83f196 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -2648,25 +2648,25 @@ bool wxDC::DoBlit(
             hBufBitmap = ::GpiCreateBitmap(GetHPS(), &vBmpHdr, 0L, NULL, NULL);
         }
 
-        POINTL                          aPoint1[4] = { 0, 0
-                                                      ,vWidth, vHeight
-                                                      ,vXdest, vYdest
-                                                      ,vXdest + vWidth, vYdest + vHeight
+        POINTL                          aPoint1[4] = { {0, 0}
+                                                     ,{vWidth, vHeight}
+                                                     ,{vXdest, vYdest}
+                                                     ,{vXdest + vWidth, vYdest + vHeight}
                                                      };
-        POINTL                          aPoint2[4] = { 0, 0
-                                                      ,vWidth, vHeight
-                                                      ,vXsrc, vYsrc
-                                                      ,vXsrc + vWidth, vYsrc + vHeight
+        POINTL                          aPoint2[4] = { {0, 0}
+                                                     ,{vWidth, vHeight}
+                                                     ,{vXsrc, vYsrc}
+                                                     ,{vXsrc + vWidth, vYsrc + vHeight}
                                                      };
-        POINTL                          aPoint3[4] = { vXdest, vYdest
-                                                      ,vXdest + vWidth, vYdest + vHeight
-                                                      ,vXsrc, vYsrc
-                                                      ,vXsrc + vWidth, vYsrc + vHeight
+        POINTL                          aPoint3[4] = { {vXdest, vYdest}
+                                                     ,{vXdest + vWidth, vYdest + vHeight}
+                                                     ,{vXsrc, vYsrc}
+                                                     ,{vXsrc + vWidth, vYsrc + vHeight}
                                                      };
-        POINTL                          aPoint4[4] = { vXdest, vYdest
-                                                      ,vXdest + vWidth, vYdest + vHeight
-                                                      ,0, 0
-                                                      ,vWidth, vHeight
+        POINTL                          aPoint4[4] = { {vXdest, vYdest}
+                                                     ,{vXdest + vWidth, vYdest + vHeight}
+                                                     ,{0, 0}
+                                                     ,{vWidth, vHeight}
                                                      };
         ::GpiSetBitmap(hPSMask, (HBITMAP) pMask->GetMaskBitmap());
         ::GpiSetBitmap(hPSBuffer, (HBITMAP) hBufBitmap);
@@ -2777,10 +2777,10 @@ bool wxDC::DoBlit(
     }
     else // no mask, just BitBlt() it
     {
-        POINTL                          aPoint[4] = { vXdest, vYdest
-                                                     ,vXdest + vWidth, vYdest + vHeight
-                                                     ,vXsrc, vYsrc
-                                                     ,vXsrc + vWidth, vYsrc + vHeight
+      POINTL                          aPoint[4] = { {vXdest, vYdest}
+                                                  ,{vXdest + vWidth, vYdest + vHeight}
+                                                  ,{vXsrc, vYsrc}
+                                                  ,{vXsrc + vWidth, vYsrc + vHeight}
                                                     };
 
         bSuccess = (::GpiBitBlt( m_hPS

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index a916c7c979f47c3deedd02d67a0a8844ddffd14b..afc541b13f4ef322ba6b01a78ee13259ab269914 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -135,11 +135,11 @@ void wxIcon::CopyFromBitmap(
     HDC                             hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
     HPS                             hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
     HPS                             hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
-    POINTL                          vPoint[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(),
-                                                  0, 0, rBmp.GetWidth(), rBmp.GetHeight()
+    POINTL                          vPoint[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()},
+                                                  {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
                                                 };
-    POINTL                          vPointMask[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight() * 2,
-                                                      0, 0, rBmp.GetWidth(), rBmp.GetHeight()
+    POINTL                          vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2},
+                                                      {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
                                                     };
 
     POINTERINFO                     vIconInfo;