https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e797499dee0df590b46f1b209e42a2b04fd8aa61
commit e797499dee0df590b46f1b209e42a2b04fd8aa61 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Tue Dec 31 15:45:57 2019 +0900 Commit: GitHub <[email protected]> CommitDate: Tue Dec 31 15:45:57 2019 +0900 [SDK][INCLUDE] Rename Gdiplus::Pen::pen as nativePen (#2206) CORE-16585 --- sdk/include/psdk/gdiplusgraphics.h | 104 +++++++++++++++++++------------------ sdk/include/psdk/gdipluspen.h | 77 +++++++++++++-------------- 2 files changed, 93 insertions(+), 88 deletions(-) diff --git a/sdk/include/psdk/gdiplusgraphics.h b/sdk/include/psdk/gdiplusgraphics.h index 5b2ace1c496..2d1988bae66 100644 --- a/sdk/include/psdk/gdiplusgraphics.h +++ b/sdk/include/psdk/gdiplusgraphics.h @@ -87,66 +87,68 @@ class Graphics : public GdiplusBase DrawArc(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle) { return SetStatus(DllExports::GdipDrawArcI( - graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawArc(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle) { return SetStatus(DllExports::GdipDrawArcI( - graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawArc(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - return SetStatus( - DllExports::GdipDrawArc(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); + return SetStatus(DllExports::GdipDrawArc( + graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawArc(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - return SetStatus( - DllExports::GdipDrawArcI(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); + return SetStatus(DllExports::GdipDrawArcI( + graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawBezier(const Pen *pen, const Point &pt1, const Point &pt2, const Point &pt3, const Point &pt4) { return SetStatus(DllExports::GdipDrawBezierI( - graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)); + graphics, pen ? pen->nativePen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)); } Status DrawBezier(const Pen *pen, const PointF &pt1, const PointF &pt2, const PointF &pt3, const PointF &pt4) { return SetStatus(DllExports::GdipDrawBezier( - graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)); + graphics, pen ? pen->nativePen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)); } Status DrawBezier(const Pen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - return SetStatus(DllExports::GdipDrawBezier(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2, x3, y3, x4, y4)); + return SetStatus( + DllExports::GdipDrawBezier(graphics, pen ? pen->nativePen : NULL, x1, y1, x2, y2, x3, y3, x4, y4)); } Status DrawBezier(const Pen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { - return SetStatus(DllExports::GdipDrawBezierI(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2, x3, y3, x4, y4)); + return SetStatus( + DllExports::GdipDrawBezierI(graphics, pen ? pen->nativePen : NULL, x1, y1, x2, y2, x3, y3, x4, y4)); } Status DrawBeziers(const Pen *pen, const Point *points, INT count) { - return SetStatus(DllExports::GdipDrawBeziersI(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawBeziersI(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawBeziers(const Pen *pen, const PointF *points, INT count) { - return SetStatus(DllExports::GdipDrawBeziers(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawBeziers(graphics, pen ? pen->nativePen : NULL, points, count)); } Status @@ -158,63 +160,65 @@ class Graphics : public GdiplusBase Status DrawClosedCurve(const Pen *pen, const Point *points, INT count) { - return SetStatus(DllExports::GdipDrawClosedCurveI(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawClosedCurveI(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawClosedCurve(const Pen *pen, const PointF *points, INT count) { - return SetStatus(DllExports::GdipDrawClosedCurve(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawClosedCurve(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawClosedCurve(const Pen *pen, const PointF *points, INT count, REAL tension) { - return SetStatus(DllExports::GdipDrawClosedCurve2(graphics, pen ? pen->pen : NULL, points, count, tension)); + return SetStatus( + DllExports::GdipDrawClosedCurve2(graphics, pen ? pen->nativePen : NULL, points, count, tension)); } Status DrawClosedCurve(const Pen *pen, const Point *points, INT count, REAL tension) { - return SetStatus(DllExports::GdipDrawClosedCurve2I(graphics, pen ? pen->pen : NULL, points, count, tension)); + return SetStatus( + DllExports::GdipDrawClosedCurve2I(graphics, pen ? pen->nativePen : NULL, points, count, tension)); } Status DrawCurve(const Pen *pen, const Point *points, INT count) { - return SetStatus(DllExports::GdipDrawCurveI(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawCurveI(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawCurve(const Pen *pen, const PointF *points, INT count) { - return SetStatus(DllExports::GdipDrawCurve(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawCurve(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawCurve(const Pen *pen, const PointF *points, INT count, REAL tension) { - return SetStatus(DllExports::GdipDrawCurve2(graphics, pen ? pen->pen : NULL, points, count, tension)); + return SetStatus(DllExports::GdipDrawCurve2(graphics, pen ? pen->nativePen : NULL, points, count, tension)); } Status DrawCurve(const Pen *pen, const Point *points, INT count, INT offset, INT numberOfSegments, REAL tension) { return SetStatus(DllExports::GdipDrawCurve3I( - graphics, pen ? pen->pen : NULL, points, count, offset, numberOfSegments, tension)); + graphics, pen ? pen->nativePen : NULL, points, count, offset, numberOfSegments, tension)); } Status DrawCurve(const Pen *pen, const PointF *points, INT count, INT offset, INT numberOfSegments, REAL tension) { return SetStatus(DllExports::GdipDrawCurve3( - graphics, pen ? pen->pen : NULL, points, count, offset, numberOfSegments, tension)); + graphics, pen ? pen->nativePen : NULL, points, count, offset, numberOfSegments, tension)); } Status DrawCurve(const Pen *pen, const Point *points, INT count, REAL tension) { - return SetStatus(DllExports::GdipDrawCurve2I(graphics, pen ? pen->pen : NULL, points, count, tension)); + return SetStatus(DllExports::GdipDrawCurve2I(graphics, pen ? pen->nativePen : NULL, points, count, tension)); } Status @@ -233,27 +237,27 @@ class Graphics : public GdiplusBase Status DrawEllipse(const Pen *pen, const Rect &rect) { - return SetStatus( - DllExports::GdipDrawEllipseI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); + return SetStatus(DllExports::GdipDrawEllipseI( + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawEllipse(const Pen *pen, REAL x, REAL y, REAL width, REAL height) { - return SetStatus(DllExports::GdipDrawEllipse(graphics, pen ? pen->pen : NULL, x, y, width, height)); + return SetStatus(DllExports::GdipDrawEllipse(graphics, pen ? pen->nativePen : NULL, x, y, width, height)); } Status DrawEllipse(const Pen *pen, const RectF &rect) { - return SetStatus( - DllExports::GdipDrawEllipse(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); + return SetStatus(DllExports::GdipDrawEllipse( + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawEllipse(const Pen *pen, INT x, INT y, INT width, INT height) { - return SetStatus(DllExports::GdipDrawEllipseI(graphics, pen ? pen->pen : NULL, x, y, width, height)); + return SetStatus(DllExports::GdipDrawEllipseI(graphics, pen ? pen->nativePen : NULL, x, y, width, height)); } Status @@ -397,37 +401,37 @@ class Graphics : public GdiplusBase Status DrawLine(const Pen *pen, const Point &pt1, const Point &pt2) { - return SetStatus(DllExports::GdipDrawLineI(graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y)); + return SetStatus(DllExports::GdipDrawLineI(graphics, pen ? pen->nativePen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y)); } Status DrawLine(const Pen *pen, const PointF &pt1, const Point &pt2) { - return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->pen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y)); + return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->nativePen : NULL, pt1.X, pt1.Y, pt2.X, pt2.Y)); } Status DrawLine(const Pen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { - return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2)); + return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->nativePen : NULL, x1, y1, x2, y2)); } Status DrawLine(const Pen *pen, INT x1, INT y1, INT x2, INT y2) { - return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->pen : NULL, x1, y1, x2, y2)); + return SetStatus(DllExports::GdipDrawLine(graphics, pen ? pen->nativePen : NULL, x1, y1, x2, y2)); } Status DrawLines(const Pen *pen, const Point *points, INT count) { - return SetStatus(DllExports::GdipDrawLinesI(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawLinesI(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawLines(const Pen *pen, const PointF *points, INT count) { - return SetStatus(DllExports::GdipDrawLines(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawLines(graphics, pen ? pen->nativePen : NULL, points, count)); } Status @@ -440,78 +444,78 @@ class Graphics : public GdiplusBase DrawPie(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle) { return SetStatus(DllExports::GdipDrawPieI( - graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawPie(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - return SetStatus( - DllExports::GdipDrawPieI(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); + return SetStatus(DllExports::GdipDrawPieI( + graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawPie(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - return SetStatus( - DllExports::GdipDrawPie(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); + return SetStatus(DllExports::GdipDrawPie( + graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle)); } Status DrawPie(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle) { return SetStatus(DllExports::GdipDrawPie( - graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)); } Status DrawPolygon(const Pen *pen, const Point *points, INT count) { - return SetStatus(DllExports::GdipDrawPolygonI(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawPolygonI(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawPolygon(const Pen *pen, const PointF *points, INT count) { - return SetStatus(DllExports::GdipDrawPolygon(graphics, pen ? pen->pen : NULL, points, count)); + return SetStatus(DllExports::GdipDrawPolygon(graphics, pen ? pen->nativePen : NULL, points, count)); } Status DrawRectangle(const Pen *pen, const Rect &rect) { - return SetStatus( - DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); + return SetStatus(DllExports::GdipDrawRectangleI( + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawRectangle(const Pen *pen, INT x, INT y, INT width, INT height) { - return SetStatus(DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, x, y, width, height)); + return SetStatus(DllExports::GdipDrawRectangleI(graphics, pen ? pen->nativePen : NULL, x, y, width, height)); } Status DrawRectangle(const Pen *pen, REAL x, REAL y, REAL width, REAL height) { - return SetStatus(DllExports::GdipDrawRectangle(graphics, pen ? pen->pen : NULL, x, y, width, height)); + return SetStatus(DllExports::GdipDrawRectangle(graphics, pen ? pen->nativePen : NULL, x, y, width, height)); } Status DrawRectangle(const Pen *pen, const RectF &rect) { - return SetStatus( - DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); + return SetStatus(DllExports::GdipDrawRectangleI( + graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); } Status DrawRectangles(const Pen *pen, const Rect *rects, INT count) { - return SetStatus(DllExports::GdipDrawRectanglesI(graphics, pen ? pen->pen : NULL, rects, count)); + return SetStatus(DllExports::GdipDrawRectanglesI(graphics, pen ? pen->nativePen : NULL, rects, count)); } Status DrawRectangles(const Pen *pen, const RectF *rects, INT count) { - return SetStatus(DllExports::GdipDrawRectangles(graphics, pen ? pen->pen : NULL, rects, count)); + return SetStatus(DllExports::GdipDrawRectangles(graphics, pen ? pen->nativePen : NULL, rects, count)); } Status diff --git a/sdk/include/psdk/gdipluspen.h b/sdk/include/psdk/gdipluspen.h index 82b2cfdf6b2..beb0e405b55 100644 --- a/sdk/include/psdk/gdipluspen.h +++ b/sdk/include/psdk/gdipluspen.h @@ -33,8 +33,8 @@ class Pen : public GdiplusBase Pen(const Color &color, REAL width = 1.0f) { Unit unit = UnitWorld; - pen = NULL; - status = DllExports::GdipCreatePen1(color.GetValue(), width, unit, &pen); + nativePen = NULL; + status = DllExports::GdipCreatePen1(color.GetValue(), width, unit, &nativePen); } Pen *Clone(VOID) @@ -45,7 +45,7 @@ class Pen : public GdiplusBase PenAlignment GetAlignment(VOID) { PenAlignment penAlignment; - SetStatus(DllExports::GdipGetPenMode(pen, &penAlignment)); + SetStatus(DllExports::GdipGetPenMode(nativePen, &penAlignment)); return penAlignment; } @@ -58,7 +58,7 @@ class Pen : public GdiplusBase GetColor(Color *color) { ARGB argb; - Status status = SetStatus(DllExports::GdipGetPenColor(pen, &argb)); + Status status = SetStatus(DllExports::GdipGetPenColor(nativePen, &argb)); if (color) color->SetValue(argb); return status; @@ -67,13 +67,14 @@ class Pen : public GdiplusBase Status GetCompoundArray(REAL *compoundArray, INT count) { - return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetPenCompoundArray(pen, count)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetPenCompoundArray(nativePen, + // count)); } INT GetCompoundArrayCount(VOID) { INT count; - SetStatus(DllExports::GdipGetPenCompoundCount(pen, &count)); + SetStatus(DllExports::GdipGetPenCompoundCount(nativePen, &count)); return count; } @@ -92,41 +93,41 @@ class Pen : public GdiplusBase DashCap GetDashCap(VOID) { DashCap dashCap; - SetStatus(DllExports::GdipGetPenDashCap197819(pen, &dashCap)); + SetStatus(DllExports::GdipGetPenDashCap197819(nativePen, &dashCap)); return dashCap; } REAL GetDashOffset(VOID) { REAL offset; - SetStatus(DllExports::GdipGetPenDashOffset(pen, &offset)); + SetStatus(DllExports::GdipGetPenDashOffset(nativePen, &offset)); return offset; } Status GetDashPattern(REAL *dashArray, INT count) { - return SetStatus(DllExports::GdipGetPenDashArray(pen, dashArray, count)); + return SetStatus(DllExports::GdipGetPenDashArray(nativePen, dashArray, count)); } INT GetDashPatternCount(VOID) { INT count; - SetStatus(DllExports::GdipGetPenDashCount(pen, &count)); + SetStatus(DllExports::GdipGetPenDashCount(nativePen, &count)); return count; } DashStyle GetDashStyle(VOID) { DashStyle dashStyle; - SetStatus(DllExports::GdipGetPenDashStyle(pen, &dashStyle)); + SetStatus(DllExports::GdipGetPenDashStyle(nativePen, &dashStyle)); return dashStyle; } LineCap GetEndCap(VOID) { LineCap endCap; - SetStatus(DllExports::GdipGetPenEndCap(pen, &endCap)); + SetStatus(DllExports::GdipGetPenEndCap(nativePen, &endCap)); return endCap; } @@ -138,28 +139,28 @@ class Pen : public GdiplusBase LineJoin GetLineJoin(VOID) { LineJoin lineJoin; - SetStatus(DllExports::GdipGetPenLineJoin(pen, &lineJoin)); + SetStatus(DllExports::GdipGetPenLineJoin(nativePen, &lineJoin)); return lineJoin; } REAL GetMiterLimit(VOID) { REAL miterLimit; - SetStatus(DllExports::GdipGetPenMiterLimit(pen, &miterLimit)); + SetStatus(DllExports::GdipGetPenMiterLimit(nativePen, &miterLimit)); return miterLimit; } PenType GetPenType(VOID) { PenType type; - SetStatus(DllExports::GdipGetPenFillType(pen, &type)); + SetStatus(DllExports::GdipGetPenFillType(nativePen, &type)); return type; } LineCap GetStartCap(VOID) { LineCap startCap; - SetStatus(DllExports::GdipGetPenStartCap(pen, &startCap)); + SetStatus(DllExports::GdipGetPenStartCap(nativePen, &startCap)); return startCap; } @@ -172,57 +173,57 @@ class Pen : public GdiplusBase REAL GetWidth(VOID) { REAL width; - SetStatus(DllExports::GdipGetPenWidth(pen, &width)); + SetStatus(DllExports::GdipGetPenWidth(nativePen, &width)); return width; } Status MultiplyTransform(Matrix *matrix, MatrixOrder order) { - return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipMultiplyPenTransform(pen, matrix ? - // matrix->nativeMatrix : NULL, order)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipMultiplyPenTransform(nativePen, matrix + // ? matrix->nativeMatrix : NULL, order)); } Status ResetTransform(VOID) { - return SetStatus(DllExports::GdipResetPenTransform(pen)); + return SetStatus(DllExports::GdipResetPenTransform(nativePen)); } Status RotateTransform(REAL angle, MatrixOrder order) { - return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipRotatePenTransform(pen, angle, + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipRotatePenTransform(nativePen, angle, // order)); } Status ScaleTransform(REAL sx, REAL sy, MatrixOrder order) { - return SetStatus(DllExports::GdipScalePenTransform(pen, sx, sy, order)); + return SetStatus(DllExports::GdipScalePenTransform(nativePen, sx, sy, order)); } Status SetAlignment(PenAlignment penAlignment) { - return SetStatus(DllExports::GdipSetPenMode(pen, penAlignment)); + return SetStatus(DllExports::GdipSetPenMode(nativePen, penAlignment)); } Status SetBrush(const Brush *brush) { - return SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->nativeBrush : NULL)); + return SetStatus(DllExports::GdipSetPenBrushFill(nativePen, brush ? brush->nativeBrush : NULL)); } Status SetColor(const Color &color) { - return SetStatus(DllExports::GdipSetPenColor(pen, color.GetValue())); + return SetStatus(DllExports::GdipSetPenColor(nativePen, color.GetValue())); } Status SetCompoundArray(const REAL *compoundArray, INT count) { - return SetStatus(DllExports::GdipSetPenCompoundArray(pen, compoundArray, count)); + return SetStatus(DllExports::GdipSetPenCompoundArray(nativePen, compoundArray, count)); } Status @@ -240,71 +241,71 @@ class Pen : public GdiplusBase Status SetDashCap(DashCap dashCap) { - return SetStatus(DllExports::GdipSetPenDashCap197819(pen, dashCap)); + return SetStatus(DllExports::GdipSetPenDashCap197819(nativePen, dashCap)); } Status SetDashOffset(REAL dashOffset) { - return SetStatus(DllExports::GdipSetPenDashOffset(pen, dashOffset)); + return SetStatus(DllExports::GdipSetPenDashOffset(nativePen, dashOffset)); } Status SetDashPattern(const REAL *dashArray, INT count) { - return SetStatus(DllExports::GdipSetPenDashArray(pen, dashArray, count)); + return SetStatus(DllExports::GdipSetPenDashArray(nativePen, dashArray, count)); } Status SetDashStyle(DashStyle dashStyle) { - return SetStatus(DllExports::GdipSetPenDashStyle(pen, dashStyle)); + return SetStatus(DllExports::GdipSetPenDashStyle(nativePen, dashStyle)); } Status SetEndCap(LineCap endCap) { - return SetStatus(DllExports::GdipSetPenEndCap(pen, endCap)); + return SetStatus(DllExports::GdipSetPenEndCap(nativePen, endCap)); } Status SetLineCap(LineCap startCap, LineCap endCap, DashCap dashCap) { - return SetStatus(DllExports::GdipSetPenLineCap197819(pen, startCap, endCap, dashCap)); + return SetStatus(DllExports::GdipSetPenLineCap197819(nativePen, startCap, endCap, dashCap)); } Status SetLineJoin(LineJoin lineJoin) { - return SetStatus(DllExports::GdipSetPenLineJoin(pen, lineJoin)); + return SetStatus(DllExports::GdipSetPenLineJoin(nativePen, lineJoin)); } Status SetMiterLimit(REAL miterLimit) { - return SetStatus(DllExports::GdipSetPenMiterLimit(pen, miterLimit)); + return SetStatus(DllExports::GdipSetPenMiterLimit(nativePen, miterLimit)); } Status SetStartCap(LineCap startCap) { - return SetStatus(DllExports::GdipSetPenStartCap(pen, startCap)); + return SetStatus(DllExports::GdipSetPenStartCap(nativePen, startCap)); } Status SetTransform(const Matrix *matrix) { - return SetStatus(DllExports::GdipSetPenTransform(pen, matrix ? matrix->nativeMatrix : NULL)); + return SetStatus(DllExports::GdipSetPenTransform(nativePen, matrix ? matrix->nativeMatrix : NULL)); } Status SetWidth(REAL width) { - return SetStatus(DllExports::GdipSetPenWidth(pen, width)); + return SetStatus(DllExports::GdipSetPenWidth(nativePen, width)); } private: - GpPen *pen; + GpPen *nativePen; private: mutable Status status;
