From: Vadim Zeitlin Date: Sun, 29 Feb 2004 23:34:01 +0000 (+0000) Subject: renamed start parameter of wxDC::DrawPolyPolygon() to count (patch 882189) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/793db75554d2d2bc5dc9b0fc42c0b7aa03a44183?ds=inline renamed start parameter of wxDC::DrawPolyPolygon() to count (patch 882189) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dc.h b/include/wx/dc.h index a01bb775ca..777ee31702 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -211,10 +211,10 @@ public: wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle = wxODDEVEN_RULE); - void DrawPolyPolygon(int n, int start[], wxPoint points[], + void DrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle = wxODDEVEN_RULE) - { DoDrawPolyPolygon(n, start, points, xoffset, yoffset, fillStyle); } + { DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); } void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { DoDrawRectangle(x, y, width, height); } @@ -695,7 +695,7 @@ protected: virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle = wxODDEVEN_RULE) = 0; - virtual void DoDrawPolyPolygon(int n, int start[], wxPoint points[], + virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle); diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index ae569a4a63..2af1c78c46 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -67,7 +67,7 @@ public: void DoDrawPoint(wxCoord x, wxCoord y); void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0); void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE); - void DoDrawPolyPolygon(int n, int start[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE); + void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE); void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20); void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index 5a82ad5609..280fba8333 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -191,7 +191,7 @@ protected: virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle = wxODDEVEN_RULE); - virtual void DoDrawPolyPolygon(int n, int start[], wxPoint points[], + virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle = wxODDEVEN_RULE); diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 7f1b5170ec..5237dabd47 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -108,14 +108,14 @@ void wxDCBase::DrawPolygon(const wxList *list, void wxDCBase::DoDrawPolyPolygon(int n, - int start[], + int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) { if ( n == 1 ) { - DoDrawPolygon(start[0], points, xoffset, yoffset, fillStyle); + DoDrawPolygon(count[0], points, xoffset, yoffset, fillStyle); return; } @@ -126,14 +126,14 @@ wxDCBase::DoDrawPolyPolygon(int n, for (i = j = lastOfs = 0; i < n; i++) { lastOfs = j; - j += start[i]; + j += count[i]; } pts = new wxPoint[j+n-1]; for (i = 0; i < j; i++) pts[i] = points[i]; for (i = 2; i <= n; i++) { - lastOfs -= start[n-i]; + lastOfs -= count[n-i]; pts[j++] = pts[lastOfs]; } @@ -143,8 +143,8 @@ wxDCBase::DoDrawPolyPolygon(int n, SetPen(pen); for (i = j = 0; i < n; i++) { - DoDrawLines(start[i], pts+j, xoffset, yoffset); - j += start[i]; + DoDrawLines(count[i], pts+j, xoffset, yoffset); + j += count[i]; } delete pts; } diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 598e845d9c..ed4bf8e189 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -613,7 +613,7 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx } } -void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -626,7 +626,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx PsPrint( "newpath\n" ); int ofs = 0; - for (int i = 0; i < n; ofs += start[i++]) + for (int i = 0; i < n; ofs += count[i++]) { wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset); wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset); @@ -635,7 +635,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); - for (int j = 1; j < start[i]; j++) + for (int j = 1; j < count[i]; j++) { xx = LogicalToDeviceX(points[ofs+j].x + xoffset); yy = LogicalToDeviceY(points[ofs+j].y + yoffset); @@ -655,7 +655,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx PsPrint( "newpath\n" ); int ofs = 0; - for (int i = 0; i < n; ofs += start[i++]) + for (int i = 0; i < n; ofs += count[i++]) { wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset); wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset); @@ -664,7 +664,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); - for (int j = 1; j < start[i]; j++) + for (int j = 1; j < count[i]; j++) { xx = LogicalToDeviceX(points[ofs+j].x + xoffset); yy = LogicalToDeviceY(points[ofs+j].y + yoffset); diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 26143fcf66..87465c8330 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -780,7 +780,7 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs void wxDC::DoDrawPolyPolygon(int n, - int start[], + int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, @@ -794,7 +794,7 @@ wxDC::DoDrawPolyPolygon(int n, wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling int i, cnt; for (i = cnt = 0; i < n; i++) - cnt += start[i]; + cnt += count[i]; // Do things less efficiently if we have offsets if (xoffset != 0 || yoffset != 0) @@ -810,7 +810,7 @@ wxDC::DoDrawPolyPolygon(int n, #ifndef __WXWINCE__ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); #endif - (void)PolyPolygon(GetHdc(), cpoints, start, n); + (void)PolyPolygon(GetHdc(), cpoints, count, n); #ifndef __WXWINCE__ SetPolyFillMode(GetHdc(),prev); #endif @@ -824,7 +824,7 @@ wxDC::DoDrawPolyPolygon(int n, #ifndef __WXWINCE__ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); #endif - (void)PolyPolygon(GetHdc(), (POINT*) points, start, n); + (void)PolyPolygon(GetHdc(), (POINT*) points, count, n); #ifndef __WXWINCE__ SetPolyFillMode(GetHdc(),prev); #endif