Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:02:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK][INCLUDE] Refinement of Gdiplus headers (#2217)

Browse source 
Define getNat helper functions in gdiplusbase.h and use them. CORE-16585
This commit is contained in:
Katayama Hirofumi MZ 2020-01-01 13:53:30 +09:00 • committed by GitHub
parent 9ba5594599
commit 84de8c3f25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 105 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

39
sdk/include/psdk/gdiplusgraphics.h
View file

@ -19,39 +19,6 @@
#ifndef _GDIPLUSGRAPHICS_H
#define _GDIPLUSGRAPHICS_H
class Image;
class ImageAttributes;
class CachedBitmap;
class Region;
class Font;
class GraphicsPath;
class Metafile;
// get native
GpImage *&
getNat(const Image *image);
GpPen *&
getNat(const Pen *pen);
GpBrush *&
getNat(const Brush *brush);
GpCachedBitmap *&
getNat(const CachedBitmap *cb);
GpImageAttributes *&
getNat(const ImageAttributes *ia);
GpRegion *&
getNat(const Region *region);
GpMatrix *&
getNat(const Matrix *matrix);
GpPath *&
getNat(const GraphicsPath *path);
class Graphics : public GdiplusBase
{
friend class Region;
@ -1401,7 +1368,7 @@ class Graphics : public GdiplusBase
Status
SetClip(const Graphics *g, CombineMode combineMode = CombineModeReplace)
{
return SetStatus(DllExports::GdipSetClipGraphics(nativeGraphics, g ? g->nativeGraphics : NULL, combineMode));
return SetStatus(DllExports::GdipSetClipGraphics(nativeGraphics, g ? getNat(g) : NULL, combineMode));
}
Status
@ -1553,9 +1520,9 @@ class Graphics : public GdiplusBase
// get native
friend inline GpGraphics *&
getNat(const Graphics *graph)
getNat(const Graphics *graphics)
{
return const_cast<Graphics *>(graph)->nativeGraphics;
return const_cast<Graphics *>(graphics)->nativeGraphics;
}
};