OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-09 18:50:54 +03:00
Code Packages Releases Activity

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

Browse Source
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

4
src/Draw/Draw_Window.cxx

@ -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;
}

20
src/XCAFDoc/XCAFDoc_Datum.hxx

@ -27,6 +27,10 @@ class TDF_Attribute;
class TDF_RelocationTable;
class XCAFDimTolObjects_DatumObject;
// resolve name collisions with WinAPI headers
#ifdef GetObject
#undef GetObject
#endif
class XCAFDoc_Datum;
DEFINE_STANDARD_HANDLE(XCAFDoc_Datum, TDF_Attribute)
@ -66,16 +70,8 @@ public:
Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(XCAFDoc_Datum,TDF_Attribute)
protected:
private:
@ -83,14 +79,6 @@ private:
Handle(TCollection_HAsciiString) myDescription;
Handle(TCollection_HAsciiString) myIdentification;
};
#endif // _XCAFDoc_Datum_HeaderFile

4
src/XCAFDoc/XCAFDoc_Dimension.hxx

@ -26,6 +26,10 @@ class TDF_Attribute;
class TDF_RelocationTable;
class XCAFDimTolObjects_DimensionObject;
// resolve name collisions with WinAPI headers
#ifdef GetObject
#undef GetObject
#endif
class XCAFDoc_Dimension;
DEFINE_STANDARD_HANDLE(XCAFDoc_Dimension, TDF_Attribute)

4
src/XCAFDoc/XCAFDoc_GeomTolerance.hxx

@ -26,6 +26,10 @@ class TDF_Attribute;
class TDF_RelocationTable;
class XCAFDimTolObjects_GeomToleranceObject;
// resolve name collisions with WinAPI headers
#ifdef GetObject
#undef GetObject
#endif
class XCAFDoc_GeomTolerance;
DEFINE_STANDARD_HANDLE(XCAFDoc_GeomTolerance, TDF_Attribute)

4
src/XCAFDoc/XCAFDoc_View.hxx

@ -26,6 +26,10 @@ class TDF_Attribute;
class TDF_RelocationTable;
class XCAFView_Object;
// resolve name collisions with WinAPI headers
#ifdef GetObject
#undef GetObject
#endif
class XCAFDoc_View;
DEFINE_STANDARD_HANDLE(XCAFDoc_View, TDF_Attribute)