From bd5dd95757ce697f95a39cfc6f346fe93421bc36 Mon Sep 17 00:00:00 2001 From: Brian Macy Date: Tue, 25 May 1999 23:38:48 +0000 Subject: [PATCH] Move code to a dcbase.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dc.h | 75 ++++--------------------------------------------- 1 file changed, 5 insertions(+), 70 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index 52b5a38e83..9b09a871a2 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -122,23 +122,7 @@ public: void DrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0) { DoDrawLines(n, points, xoffset, yoffset); } - void DrawLines(const wxList *list, long xoffset = 0, long yoffset = 0) - { - int n = list->Number(); - wxPoint *points = new wxPoint[n]; - - int i = 0; - for ( wxNode *node = list->First(); node; node = node->Next(), i++ ) - { - wxPoint *point = (wxPoint *)node->Data(); - points[i].x = point->x; - points[i].y = point->y; - } - - DoDrawLines(n, points, xoffset, yoffset); - - delete [] points; - } + void DrawLines(const wxList *list, long xoffset = 0, long yoffset = 0); void DrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, @@ -147,23 +131,7 @@ public: void DrawPolygon(const wxList *list, long xoffset = 0, long yoffset = 0, - int fillStyle = wxODDEVEN_RULE) - { - int n = list->Number(); - wxPoint *points = new wxPoint[n]; - - int i = 0; - for ( wxNode *node = list->First(); node; node = node->Next(), i++ ) - { - wxPoint *point = (wxPoint *)node->Data(); - points[i].x = point->x; - points[i].y = point->y; - } - - DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); - - delete [] points; - } + int fillStyle = wxODDEVEN_RULE); void DrawRectangle(long x, long y, long width, long height) { DoDrawRectangle(x, y, width, height); } @@ -222,42 +190,9 @@ public: } #if wxUSE_SPLINES - // TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?) - void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3) - { - wxList point_list; - - wxPoint *point1 = new wxPoint; - point1->x = x1; point1->y = y1; - point_list.Append((wxObject*)point1); - - wxPoint *point2 = new wxPoint; - point2->x = x2; point2->y = y2; - point_list.Append((wxObject*)point2); - - wxPoint *point3 = new wxPoint; - point3->x = x3; point3->y = y3; - point_list.Append((wxObject*)point3); - - DrawSpline(&point_list); - - for( wxNode *node = point_list.First(); node; node = node->Next() ) - { - wxPoint *p = (wxPoint *)node->Data(); - delete p; - } - } - - void DrawSpline(int n, wxPoint points[]) - { - wxList list; - for (int i =0; i < n; i++) - { - list.Append((wxObject*)&points[i]); - } - - DrawSpline(&list); - } +// TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?) + void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3); + void DrawSpline(int n, wxPoint points[]); void DrawSpline(wxList *points) { DoDrawSpline(points); } #endif // wxUSE_SPLINES -- 2.45.2