Correctly bracketed initializers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ee22d7f339
commit
3c623cf7d9
@ -698,9 +698,9 @@ bool wxBitmap::CreateFromImage (
|
|||||||
,PU_PELS | GPIA_ASSOC
|
,PU_PELS | GPIA_ASSOC
|
||||||
);
|
);
|
||||||
|
|
||||||
POINTL vPoint[4] = { 0, nOrigin,
|
POINTL vPoint[4] = { {0, nOrigin},
|
||||||
nWidth, nHeight,
|
{nWidth, nHeight},
|
||||||
0, 0, nWidth, nHeight
|
{0, 0}, {nWidth, nHeight}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -799,9 +799,9 @@ bool wxBitmap::CreateFromImage (
|
|||||||
,&vSize
|
,&vSize
|
||||||
,PU_PELS | GPIA_ASSOC
|
,PU_PELS | GPIA_ASSOC
|
||||||
);
|
);
|
||||||
POINTL vPoint2[4] = { 0, nOrigin,
|
POINTL vPoint2[4] = { {0, nOrigin},
|
||||||
nWidth, nHeight,
|
{nWidth, nHeight},
|
||||||
0, 0, nWidth, nHeight
|
{0, 0}, {nWidth, nHeight}
|
||||||
};
|
};
|
||||||
::GpiBitBlt( hPSScreen
|
::GpiBitBlt( hPSScreen
|
||||||
,hPS
|
,hPS
|
||||||
@ -1092,9 +1092,9 @@ wxBitmap wxBitmap::GetSubBitmap(
|
|||||||
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, rRect.width, rRect.height,
|
POINTL vPoint[4] = { {0, 0}, {rRect.width, rRect.height},
|
||||||
rRect.x, rRect.y,
|
{rRect.x, rRect.y},
|
||||||
rRect.x + rRect.width, rRect.y + rRect.height
|
{rRect.x + rRect.width, rRect.y + rRect.height}
|
||||||
};
|
};
|
||||||
|
|
||||||
::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());
|
::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());
|
||||||
@ -1254,8 +1254,8 @@ bool wxMask::Create(
|
|||||||
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, rBitmap.GetWidth(), rBitmap.GetHeight(),
|
POINTL vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()},
|
||||||
0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
|
{0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (m_hMaskBitmap)
|
if (m_hMaskBitmap)
|
||||||
@ -1355,8 +1355,8 @@ bool wxMask::Create(
|
|||||||
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, rBitmap.GetWidth(), rBitmap.GetHeight(),
|
POINTL vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()},
|
||||||
0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
|
{0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (m_hMaskBitmap)
|
if (m_hMaskBitmap)
|
||||||
@ -1560,8 +1560,8 @@ HBITMAP wxInvertMask(
|
|||||||
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, nWidth, nHeight,
|
POINTL vPoint[4] = { {0 ,0}, {nWidth, nHeight},
|
||||||
0, 0, nWidth, nHeight
|
{0, 0}, {nWidth, nHeight}
|
||||||
};
|
};
|
||||||
|
|
||||||
memset(&vBmih, '\0', 16);
|
memset(&vBmih, '\0', 16);
|
||||||
|
Loading…
Reference in New Issue
Block a user