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

[SDK][INCLUDE] Rename Gdiplus::Pen::pen as nativePen (#2206)

Browse source 
CORE-16585
This commit is contained in:
Katayama Hirofumi MZ 2019-12-31 15:45:57 +09:00 • committed by GitHub
parent 9f4d733d1f
commit e797499dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 93 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,66 +87,68 @@ class Graphics : public GdiplusBase
DrawArc(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle) DrawArc(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus(DllExports::GdipDrawArcI( 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 Status
DrawArc(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle) DrawArc(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus(DllExports::GdipDrawArcI( 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 Status
DrawArc(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) DrawArc(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawArc(
DllExports::GdipDrawArc(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle));
} }
Status Status
DrawArc(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) DrawArc(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawArcI(
DllExports::GdipDrawArcI(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle));
} }
Status Status
DrawBezier(const Pen *pen, const Point &pt1, const Point &pt2, const Point &pt3, const Point &pt4) DrawBezier(const Pen *pen, const Point &pt1, const Point &pt2, const Point &pt3, const Point &pt4)
{ {
return SetStatus(DllExports::GdipDrawBezierI( 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 Status
DrawBezier(const Pen *pen, const PointF &pt1, const PointF &pt2, const PointF &pt3, const PointF &pt4) DrawBezier(const Pen *pen, const PointF &pt1, const PointF &pt2, const PointF &pt3, const PointF &pt4)
{ {
return SetStatus(DllExports::GdipDrawBezier( 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 Status
DrawBezier(const Pen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) 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 Status
DrawBezier(const Pen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) 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 Status
DrawBeziers(const Pen *pen, const Point *points, INT count) 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 Status
DrawBeziers(const Pen *pen, const PointF *points, INT count) 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 Status
@ -158,63 +160,65 @@ class Graphics : public GdiplusBase
Status Status
DrawClosedCurve(const Pen *pen, const Point *points, INT count) 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 Status
DrawClosedCurve(const Pen *pen, const PointF *points, INT count) 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 Status
DrawClosedCurve(const Pen *pen, const PointF *points, INT count, REAL tension) 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 Status
DrawClosedCurve(const Pen *pen, const Point *points, INT count, REAL tension) 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 Status
DrawCurve(const Pen *pen, const Point *points, INT count) 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 Status
DrawCurve(const Pen *pen, const PointF *points, INT count) 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 Status
DrawCurve(const Pen *pen, const PointF *points, INT count, REAL tension) 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 Status
DrawCurve(const Pen *pen, const Point *points, INT count, INT offset, INT numberOfSegments, REAL tension) DrawCurve(const Pen *pen, const Point *points, INT count, INT offset, INT numberOfSegments, REAL tension)
{ {
return SetStatus(DllExports::GdipDrawCurve3I( 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 Status
DrawCurve(const Pen *pen, const PointF *points, INT count, INT offset, INT numberOfSegments, REAL tension) DrawCurve(const Pen *pen, const PointF *points, INT count, INT offset, INT numberOfSegments, REAL tension)
{ {
return SetStatus(DllExports::GdipDrawCurve3( 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 Status
DrawCurve(const Pen *pen, const Point *points, INT count, REAL tension) 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 Status
@ -233,27 +237,27 @@ class Graphics : public GdiplusBase
Status Status
DrawEllipse(const Pen *pen, const Rect &rect) DrawEllipse(const Pen *pen, const Rect &rect)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawEllipseI(
DllExports::GdipDrawEllipseI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height));
} }
Status Status
DrawEllipse(const Pen *pen, REAL x, REAL y, REAL width, REAL height) 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 Status
DrawEllipse(const Pen *pen, const RectF &rect) DrawEllipse(const Pen *pen, const RectF &rect)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawEllipse(
DllExports::GdipDrawEllipse(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height));
} }
Status Status
DrawEllipse(const Pen *pen, INT x, INT y, INT width, INT height) 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 Status
@ -397,37 +401,37 @@ class Graphics : public GdiplusBase
Status Status
DrawLine(const Pen *pen, const Point &pt1, const Point &pt2) 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 Status
DrawLine(const Pen *pen, const PointF &pt1, const Point &pt2) 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 Status
DrawLine(const Pen *pen, REAL x1, REAL y1, REAL x2, REAL y2) 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 Status
DrawLine(const Pen *pen, INT x1, INT y1, INT x2, INT y2) 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 Status
DrawLines(const Pen *pen, const Point *points, INT count) 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 Status
DrawLines(const Pen *pen, const PointF *points, INT count) 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 Status
@ -440,78 +444,78 @@ class Graphics : public GdiplusBase
DrawPie(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle) DrawPie(const Pen *pen, const Rect &rect, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus(DllExports::GdipDrawPieI( 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 Status
DrawPie(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) DrawPie(const Pen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawPieI(
DllExports::GdipDrawPieI(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle));
} }
Status Status
DrawPie(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) DrawPie(const Pen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawPie(
DllExports::GdipDrawPie(graphics, pen ? pen->pen : NULL, x, y, width, height, startAngle, sweepAngle)); graphics, pen ? pen->nativePen : NULL, x, y, width, height, startAngle, sweepAngle));
} }
Status Status
DrawPie(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle) DrawPie(const Pen *pen, const RectF &rect, REAL startAngle, REAL sweepAngle)
{ {
return SetStatus(DllExports::GdipDrawPie( 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 Status
DrawPolygon(const Pen *pen, const Point *points, INT count) 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 Status
DrawPolygon(const Pen *pen, const PointF *points, INT count) 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 Status
DrawRectangle(const Pen *pen, const Rect &rect) DrawRectangle(const Pen *pen, const Rect &rect)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawRectangleI(
DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height));
} }
Status Status
DrawRectangle(const Pen *pen, INT x, INT y, INT width, INT height) 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 Status
DrawRectangle(const Pen *pen, REAL x, REAL y, REAL width, REAL height) 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 Status
DrawRectangle(const Pen *pen, const RectF &rect) DrawRectangle(const Pen *pen, const RectF &rect)
{ {
return SetStatus( return SetStatus(DllExports::GdipDrawRectangleI(
DllExports::GdipDrawRectangleI(graphics, pen ? pen->pen : NULL, rect.X, rect.Y, rect.Width, rect.Height)); graphics, pen ? pen->nativePen : NULL, rect.X, rect.Y, rect.Width, rect.Height));
} }
Status Status
DrawRectangles(const Pen *pen, const Rect *rects, INT count) 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 Status
DrawRectangles(const Pen *pen, const RectF *rects, INT count) 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 Status

77
sdk/include/psdk/gdipluspen.h
View file

@ -33,8 +33,8 @@ class Pen : public GdiplusBase
Pen(const Color &color, REAL width = 1.0f) Pen(const Color &color, REAL width = 1.0f)
{ {
Unit unit = UnitWorld; Unit unit = UnitWorld;
pen = NULL; nativePen = NULL;
status = DllExports::GdipCreatePen1(color.GetValue(), width, unit, &pen); status = DllExports::GdipCreatePen1(color.GetValue(), width, unit, &nativePen);
} }
Pen *Clone(VOID) Pen *Clone(VOID)
@ -45,7 +45,7 @@ class Pen : public GdiplusBase
PenAlignment GetAlignment(VOID) PenAlignment GetAlignment(VOID)
{ {
PenAlignment penAlignment; PenAlignment penAlignment;
SetStatus(DllExports::GdipGetPenMode(pen, &penAlignment)); SetStatus(DllExports::GdipGetPenMode(nativePen, &penAlignment));
return penAlignment; return penAlignment;
} }
@ -58,7 +58,7 @@ class Pen : public GdiplusBase
GetColor(Color *color) GetColor(Color *color)
{ {
ARGB argb; ARGB argb;
Status status = SetStatus(DllExports::GdipGetPenColor(pen, &argb)); Status status = SetStatus(DllExports::GdipGetPenColor(nativePen, &argb));
if (color) if (color)
color->SetValue(argb); color->SetValue(argb);
return status; return status;
@ -67,13 +67,14 @@ class Pen : public GdiplusBase
Status Status
GetCompoundArray(REAL *compoundArray, INT count) 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 GetCompoundArrayCount(VOID)
{ {
INT count; INT count;
SetStatus(DllExports::GdipGetPenCompoundCount(pen, &count)); SetStatus(DllExports::GdipGetPenCompoundCount(nativePen, &count));
return count; return count;
} }
@ -92,41 +93,41 @@ class Pen : public GdiplusBase
DashCap GetDashCap(VOID) DashCap GetDashCap(VOID)
{ {
DashCap dashCap; DashCap dashCap;
SetStatus(DllExports::GdipGetPenDashCap197819(pen, &dashCap)); SetStatus(DllExports::GdipGetPenDashCap197819(nativePen, &dashCap));
return dashCap; return dashCap;
} }
REAL GetDashOffset(VOID) REAL GetDashOffset(VOID)
{ {
REAL offset; REAL offset;
SetStatus(DllExports::GdipGetPenDashOffset(pen, &offset)); SetStatus(DllExports::GdipGetPenDashOffset(nativePen, &offset));
return offset; return offset;
} }
Status Status
GetDashPattern(REAL *dashArray, INT count) GetDashPattern(REAL *dashArray, INT count)
{ {
return SetStatus(DllExports::GdipGetPenDashArray(pen, dashArray, count)); return SetStatus(DllExports::GdipGetPenDashArray(nativePen, dashArray, count));
} }
INT GetDashPatternCount(VOID) INT GetDashPatternCount(VOID)
{ {
INT count; INT count;
SetStatus(DllExports::GdipGetPenDashCount(pen, &count)); SetStatus(DllExports::GdipGetPenDashCount(nativePen, &count));
return count; return count;
} }
DashStyle GetDashStyle(VOID) DashStyle GetDashStyle(VOID)
{ {
DashStyle dashStyle; DashStyle dashStyle;
SetStatus(DllExports::GdipGetPenDashStyle(pen, &dashStyle)); SetStatus(DllExports::GdipGetPenDashStyle(nativePen, &dashStyle));
return dashStyle; return dashStyle;
} }
LineCap GetEndCap(VOID) LineCap GetEndCap(VOID)
{ {
LineCap endCap; LineCap endCap;
SetStatus(DllExports::GdipGetPenEndCap(pen, &endCap)); SetStatus(DllExports::GdipGetPenEndCap(nativePen, &endCap));
return endCap; return endCap;
} }
@ -138,28 +139,28 @@ class Pen : public GdiplusBase
LineJoin GetLineJoin(VOID) LineJoin GetLineJoin(VOID)
{ {
LineJoin lineJoin; LineJoin lineJoin;
SetStatus(DllExports::GdipGetPenLineJoin(pen, &lineJoin)); SetStatus(DllExports::GdipGetPenLineJoin(nativePen, &lineJoin));
return lineJoin; return lineJoin;
} }
REAL GetMiterLimit(VOID) REAL GetMiterLimit(VOID)
{ {
REAL miterLimit; REAL miterLimit;
SetStatus(DllExports::GdipGetPenMiterLimit(pen, &miterLimit)); SetStatus(DllExports::GdipGetPenMiterLimit(nativePen, &miterLimit));
return miterLimit; return miterLimit;
} }
PenType GetPenType(VOID) PenType GetPenType(VOID)
{ {
PenType type; PenType type;
SetStatus(DllExports::GdipGetPenFillType(pen, &type)); SetStatus(DllExports::GdipGetPenFillType(nativePen, &type));
return type; return type;
} }
LineCap GetStartCap(VOID) LineCap GetStartCap(VOID)
{ {
LineCap startCap; LineCap startCap;
SetStatus(DllExports::GdipGetPenStartCap(pen, &startCap)); SetStatus(DllExports::GdipGetPenStartCap(nativePen, &startCap));
return startCap; return startCap;
} }
@ -172,57 +173,57 @@ class Pen : public GdiplusBase
REAL GetWidth(VOID) REAL GetWidth(VOID)
{ {
REAL width; REAL width;
SetStatus(DllExports::GdipGetPenWidth(pen, &width)); SetStatus(DllExports::GdipGetPenWidth(nativePen, &width));
return width; return width;
} }
Status Status
MultiplyTransform(Matrix *matrix, MatrixOrder order) MultiplyTransform(Matrix *matrix, MatrixOrder order)
{ {
return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipMultiplyPenTransform(pen, matrix ? return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipMultiplyPenTransform(nativePen, matrix
// matrix->nativeMatrix : NULL, order)); // ? matrix->nativeMatrix : NULL, order));
} }
Status ResetTransform(VOID) Status ResetTransform(VOID)
{ {
return SetStatus(DllExports::GdipResetPenTransform(pen)); return SetStatus(DllExports::GdipResetPenTransform(nativePen));
} }
Status Status
RotateTransform(REAL angle, MatrixOrder order) 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)); // order));
} }
Status Status
ScaleTransform(REAL sx, REAL sy, MatrixOrder order) ScaleTransform(REAL sx, REAL sy, MatrixOrder order)
{ {
return SetStatus(DllExports::GdipScalePenTransform(pen, sx, sy, order)); return SetStatus(DllExports::GdipScalePenTransform(nativePen, sx, sy, order));
} }
Status Status
SetAlignment(PenAlignment penAlignment) SetAlignment(PenAlignment penAlignment)
{ {
return SetStatus(DllExports::GdipSetPenMode(pen, penAlignment)); return SetStatus(DllExports::GdipSetPenMode(nativePen, penAlignment));
} }
Status Status
SetBrush(const Brush *brush) SetBrush(const Brush *brush)
{ {
return SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->nativeBrush : NULL)); return SetStatus(DllExports::GdipSetPenBrushFill(nativePen, brush ? brush->nativeBrush : NULL));
} }
Status Status
SetColor(const Color &color) SetColor(const Color &color)
{ {
return SetStatus(DllExports::GdipSetPenColor(pen, color.GetValue())); return SetStatus(DllExports::GdipSetPenColor(nativePen, color.GetValue()));
} }
Status Status
SetCompoundArray(const REAL *compoundArray, INT count) SetCompoundArray(const REAL *compoundArray, INT count)
{ {
return SetStatus(DllExports::GdipSetPenCompoundArray(pen, compoundArray, count)); return SetStatus(DllExports::GdipSetPenCompoundArray(nativePen, compoundArray, count));
} }
Status Status
@ -240,71 +241,71 @@ class Pen : public GdiplusBase
Status Status
SetDashCap(DashCap dashCap) SetDashCap(DashCap dashCap)
{ {
return SetStatus(DllExports::GdipSetPenDashCap197819(pen, dashCap)); return SetStatus(DllExports::GdipSetPenDashCap197819(nativePen, dashCap));
} }
Status Status
SetDashOffset(REAL dashOffset) SetDashOffset(REAL dashOffset)
{ {
return SetStatus(DllExports::GdipSetPenDashOffset(pen, dashOffset)); return SetStatus(DllExports::GdipSetPenDashOffset(nativePen, dashOffset));
} }
Status Status
SetDashPattern(const REAL *dashArray, INT count) SetDashPattern(const REAL *dashArray, INT count)
{ {
return SetStatus(DllExports::GdipSetPenDashArray(pen, dashArray, count)); return SetStatus(DllExports::GdipSetPenDashArray(nativePen, dashArray, count));
} }
Status Status
SetDashStyle(DashStyle dashStyle) SetDashStyle(DashStyle dashStyle)
{ {
return SetStatus(DllExports::GdipSetPenDashStyle(pen, dashStyle)); return SetStatus(DllExports::GdipSetPenDashStyle(nativePen, dashStyle));
} }
Status Status
SetEndCap(LineCap endCap) SetEndCap(LineCap endCap)
{ {
return SetStatus(DllExports::GdipSetPenEndCap(pen, endCap)); return SetStatus(DllExports::GdipSetPenEndCap(nativePen, endCap));
} }
Status Status
SetLineCap(LineCap startCap, LineCap endCap, DashCap dashCap) SetLineCap(LineCap startCap, LineCap endCap, DashCap dashCap)
{ {
return SetStatus(DllExports::GdipSetPenLineCap197819(pen, startCap, endCap, dashCap)); return SetStatus(DllExports::GdipSetPenLineCap197819(nativePen, startCap, endCap, dashCap));
} }
Status Status
SetLineJoin(LineJoin lineJoin) SetLineJoin(LineJoin lineJoin)
{ {
return SetStatus(DllExports::GdipSetPenLineJoin(pen, lineJoin)); return SetStatus(DllExports::GdipSetPenLineJoin(nativePen, lineJoin));
} }
Status Status
SetMiterLimit(REAL miterLimit) SetMiterLimit(REAL miterLimit)
{ {
return SetStatus(DllExports::GdipSetPenMiterLimit(pen, miterLimit)); return SetStatus(DllExports::GdipSetPenMiterLimit(nativePen, miterLimit));
} }
Status Status
SetStartCap(LineCap startCap) SetStartCap(LineCap startCap)
{ {
return SetStatus(DllExports::GdipSetPenStartCap(pen, startCap)); return SetStatus(DllExports::GdipSetPenStartCap(nativePen, startCap));
} }
Status Status
SetTransform(const Matrix *matrix) SetTransform(const Matrix *matrix)
{ {
return SetStatus(DllExports::GdipSetPenTransform(pen, matrix ? matrix->nativeMatrix : NULL)); return SetStatus(DllExports::GdipSetPenTransform(nativePen, matrix ? matrix->nativeMatrix : NULL));
} }
Status Status
SetWidth(REAL width) SetWidth(REAL width)
{ {
return SetStatus(DllExports::GdipSetPenWidth(pen, width)); return SetStatus(DllExports::GdipSetPenWidth(nativePen, width));
} }
private: private:
GpPen *pen; GpPen *nativePen;
private: private:
mutable Status status; mutable Status status;