Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly bracketed initializers.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-10-02 18:08:25 +00:00
parent bfe3577625
commit b93aba841c
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/os2/dc.cpp
View File

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

8
src/os2/icon.cpp
View File

@@ -135,11 +135,11 @@ void wxIcon::CopyFromBitmap(
HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
POINTL vPoint[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(), POINTL vPoint[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()},
0, 0, rBmp.GetWidth(), rBmp.GetHeight() {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
}; };
POINTL vPointMask[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight() * 2, POINTL vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2},
0, 0, rBmp.GetWidth(), rBmp.GetHeight() {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
}; };
POINTERINFO vIconInfo; POINTERINFO vIconInfo;