1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0028822: Configuration, XCAFDoc - fix name collision with macros GetObject()

This commit is contained in:
kgv
2017-06-07 15:12:58 +03:00
committed by bugmaster
parent b2857a7ef0
commit b07ce12b5f
5 changed files with 18 additions and 18 deletions

View File

@@ -1579,7 +1579,7 @@ void DrawWindow::InitBuffer()
GetClientRect(win, &rc);
if (myMemHbm) {
BITMAP aBmp;
GetObject(myMemHbm, sizeof(BITMAP), &aBmp);
GetObjectW (myMemHbm, sizeof(BITMAP), &aBmp);
if (rc.right-rc.left == aBmp.bmWidth && rc.bottom-rc.top == aBmp.bmHeight) return;
DeleteObject(myMemHbm);
}
@@ -1789,7 +1789,7 @@ static Standard_Boolean SaveBitmap (HBITMAP theHBitmap,
{
// Get informations about the bitmap
BITMAP aBitmap;
if (GetObject (theHBitmap, sizeof(BITMAP), (LPSTR )&aBitmap) == 0)
if (GetObjectW (theHBitmap, sizeof(BITMAP), &aBitmap) == 0)
{
return Standard_False;
}