X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4efd74436a13b03d10d9cf5759e65cbbb36993d9..520e470fdd0daef09c77938db642e4583933c90d:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 365714b327..7e1e5a36af 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -33,9 +33,8 @@ #include #include -#include -#if USE_COMMON_DIALOGS +#if wxUSE_COMMON_DIALOGS #include #endif @@ -68,38 +67,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) // Default constructor wxDC::wxDC(void) { - // Stop internal GDI objects being found and pointers kept - // after these objects have been deleted. - // No - it's OK; these lists won't return them - // because their 'visible' status will be FALSE. -/* - wxTheFontList->RemoveFont(&m_font); - wxThePenList->RemovePen(&m_pen); - wxTheBrushList->RemoveBrush(&m_brush); - wxTheBrushList->RemoveBrush(&m_backgroundBrush); -*/ - m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0; m_clipping = FALSE; - m_autoSetting = TRUE ; -// m_scaleGDI = TRUE; m_filename = ""; -// m_selectedBitmap = NULL; m_canvas = NULL; -/* - cur_dc = NULL ; - cur_bk = 0 ; - cur_cpen = NULL ; - cur_cbrush = NULL ; -*/ m_oldBitmap = 0; m_oldPen = 0; m_oldBrush = 0; m_oldFont = 0; m_oldPalette = 0; m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0; -// m_font = NULL; m_logicalOriginX = 0; m_logicalOriginY = 0; m_deviceOriginX = 0; @@ -113,7 +91,6 @@ wxDC::wxDC(void) m_systemScaleX = 1.0; m_systemScaleY = 1.0; m_mappingMode = MM_TEXT; -// m_dontDelete = FALSE; m_bOwnsDC = FALSE; m_hDC = 0; m_clipping = FALSE; @@ -123,7 +100,6 @@ wxDC::wxDC(void) m_logicalFunction = -1; m_backgroundBrush = *wxWHITE_BRUSH; -// m_backgroundBrush.UseResource(); m_textForegroundColour = *wxBLACK; m_textBackgroundColour = *wxWHITE; @@ -146,13 +122,6 @@ wxDC::~wxDC(void) } } -/* - if (m_hDC) - { - SelectOldObjects(m_hDC); - ::DeleteDC((HDC) m_hDC); - } -*/ } // This will select current objects out of the DC, @@ -160,14 +129,14 @@ wxDC::~wxDC(void) // DC. void wxDC::SelectOldObjects(WXHDC dc) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects %X\n", this); #endif if (dc) { if (m_oldBitmap) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBITMAP %X\n", m_oldBitmap); #endif ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); @@ -179,7 +148,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldBitmap = 0 ; if (m_oldPen) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPEN %X\n", m_oldPen); #endif ::SelectObject((HDC) dc, (HPEN) m_oldPen); @@ -187,7 +156,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldPen = 0 ; if (m_oldBrush) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBRUSH %X\n", m_oldBrush); #endif ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush); @@ -195,7 +164,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldBrush = 0 ; if (m_oldFont) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HFONT %X\n", m_oldFont); #endif ::SelectObject((HDC) dc, (HFONT) m_oldFont); @@ -203,26 +172,16 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldFont = 0 ; if (m_oldPalette) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPALETTE %X\n", m_oldPalette); #endif ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE); } -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Done.\n"); #endif m_oldPalette = 0 ; } -/* - if (m_font.Ok()) - m_font.ReleaseResource(); - if (m_pen.Ok()) - m_pen.ReleaseResource(); - if (m_brush.Ok()) - m_brush.ReleaseResource(); - if (m_backgroundBrush.Ok()) - m_backgroundBrush.ReleaseResource(); -*/ m_brush = wxNullBrush ; m_pen = wxNullPen; @@ -240,11 +199,7 @@ void wxDC::SetClippingRegion(long cx, long cy, long cw, long ch) m_clipX2 = (int)(cx + cw); m_clipY2 = (int)(cy + ch); - BeginDrawing(); - DoClipping((WXHDC) m_hDC); - - EndDrawing(); } void wxDC::DoClipping(WXHDC dc) @@ -253,44 +208,24 @@ void wxDC::DoClipping(WXHDC dc) { IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1), XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2)); -#if 0 - int x_off = 0; - int y_off = 0; - if (m_canvas) - { - m_canvas->CalcScrolledPosition(0, 0, &x_off, &y_off); - } -// HRGN rgn = CreateRectRgn(XLOG2DEV(m_clipX1 + x_off), YLOG2DEV(m_clipY1 + y_off), -// XLOG2DEV(m_clipX2 + x_off), YLOG2DEV(m_clipY2 + y_off)); - -// SelectClipRgn(dc, rgn); -// DeleteObject(rgn); - IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1 + x_off), YLOG2DEV(m_clipY1 + y_off), - XLOG2DEV(m_clipX2 + x_off), YLOG2DEV(m_clipY2 + y_off)); -#endif } } void wxDC::DestroyClippingRegion(void) { - BeginDrawing(); - if (m_clipping && m_hDC) { -// SelectClipRgn(dc, NULL); HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DestroyClippingRegion: Selecting HRGN %X\n", rgn); #endif SelectClipRgn((HDC) m_hDC, rgn); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DestroyClippingRegion: Deleting HRGN %X\n", rgn); #endif DeleteObject(rgn); } m_clipping = FALSE; - - EndDrawing(); } bool wxDC::CanDrawBitmap(void) const @@ -314,7 +249,13 @@ bool wxDC::CanGetTextExtent(void) const void wxDC::SetPalette(const wxPalette& palette) { - BeginDrawing(); + // Set the old object temporarily, in case the assignment deletes an object + // that's not yet selected out. + if (m_oldPalette) + { + ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE); + m_oldPalette = 0; + } m_palette = m_palette; @@ -325,7 +266,7 @@ void wxDC::SetPalette(const wxPalette& palette) if (m_oldPalette) { ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetPalette: set old palette %X\n", m_oldPalette); #endif m_oldPalette = 0; @@ -340,7 +281,7 @@ void wxDC::SetPalette(const wxPalette& palette) if (!m_oldPalette) m_oldPalette = (WXHPALETTE) oldPal; -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetPalette %X: selected palette %X\n", this, m_palette.GetHPALETTE()); if (oldPal) wxDebugMsg("wxDC::SetPalette: oldPal was palette %X\n", oldPal); @@ -349,14 +290,10 @@ void wxDC::SetPalette(const wxPalette& palette) #endif ::RealizePalette((HDC) m_hDC); } - - EndDrawing(); } void wxDC::Clear(void) { - BeginDrawing(); - RECT rect; if (m_canvas) GetClientRect((HWND) m_canvas->GetHWND(), &rect); @@ -378,31 +315,16 @@ void wxDC::Clear(void) ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL); ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); - - EndDrawing(); } -void wxDC::FloodFill(long x, long y, wxColour *col, int style) +void wxDC::FloodFill(long x, long y, const wxColour& col, int style) { -// int xx = (int)x; -// int yy = (int)y; - - if (m_brush.Ok() && m_autoSetting) - SetBrush(m_brush); - -// if (m_canvas) -// m_canvas->CalcScrolledPosition((int)x, (int)y, &xx, &yy); - - BeginDrawing(); - (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), - col->GetPixel(), + col.GetPixel(), style==wxFLOOD_SURFACE? FLOODFILLSURFACE:FLOODFILLBORDER ); - EndDrawing(); - CalcBoundingBox(x, y); } @@ -433,37 +355,24 @@ bool wxDC::GetPixel(long x, long y, wxColour *col) const void wxDC::CrossHair(long x, long y) { - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen); - // We suppose that our screen is 2000x2000 max. long x1 = x-2000; long y1 = y-2000; long x2 = x+2000; long y2 = y+2000; - BeginDrawing(); - (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL); (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y)); (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL); (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2)); - EndDrawing(); - CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); } void wxDC::DrawLine(long x1, long y1, long x2, long y2) { -// BUGBUG - is this necessary? YES YES YES YEs Yes yes ye.... - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen); - - BeginDrawing(); - (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y1), NULL); (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y2)); @@ -472,13 +381,11 @@ void wxDC::DrawLine(long x1, long y1, long x2, long y2) (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2)); #endif - EndDrawing(); - CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); } -void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) +void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc) { double dx = xc-x1 ; double dy = yc-y1 ; @@ -489,12 +396,6 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) return ; } -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - - BeginDrawing(); - long xx1 = XLOG2DEV(x1) ; long yy1 = YLOG2DEV(y1) ; long xx2 = XLOG2DEV(x2) ; @@ -510,107 +411,98 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) long yyy2 = (long) (yyc+ray); if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT) { -// BUGBUG - is this necessary? - if (m_brush.GetStyle()!=wxTRANSPARENT&&m_autoSetting) - SetBrush(m_brush) ; - Pie((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2, + // Have to add 1 to bottom-right corner of rectangle + // to make semi-circles look right (crooked line otherwise). + // Unfortunately this is not a reliable method, depends + // on the size of shape. + // TODO: figure out why this happens! + Pie((HDC) m_hDC,xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2) ; } else Arc((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2) ; - EndDrawing(); - CalcBoundingBox((xc-radius), (yc-radius)); CalcBoundingBox((xc+radius), (yc+radius)); } void wxDC::DrawPoint(long x, long y) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - - BeginDrawing(); - COLORREF color = 0x00ffffff; if (m_pen.Ok()) { -// m_pen.RealizeResource(); color = m_pen.GetColour().GetPixel() ; } SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color); - EndDrawing(); - CalcBoundingBox(x, y); } void wxDC::DrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - - BeginDrawing(); - - POINT *cpoints = new POINT[n]; - int i; - for (i = 0; i < n; i++) + // Do things less efficiently if we have offsets + if (xoffset != 0 || yoffset != 0) { - cpoints[i].x = (int)(XLOG2DEV(points[i].x + xoffset)); - cpoints[i].y = (int)(YLOG2DEV(points[i].y + yoffset)); + POINT *cpoints = new POINT[n]; + int i; + for (i = 0; i < n; i++) + { + cpoints[i].x = (int)(points[i].x + xoffset); + cpoints[i].y = (int)(points[i].y + yoffset); - CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset); + CalcBoundingBox(cpoints[i].x, cpoints[i].y); + } + int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ; + (void)Polygon((HDC) m_hDC, cpoints, n); + SetPolyFillMode((HDC) m_hDC,prev) ; + delete[] cpoints; } + else + { + int i; + for (i = 0; i < n; i++) + CalcBoundingBox(points[i].x, points[i].y); - int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ; - (void)Polygon((HDC) m_hDC, cpoints, n); - SetPolyFillMode((HDC) m_hDC,prev) ; - - EndDrawing(); - - delete[] cpoints; + int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ; + (void)Polygon((HDC) m_hDC, (POINT*) points, n); + SetPolyFillMode((HDC) m_hDC,prev) ; + } } void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long yoffset) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - - BeginDrawing(); - - POINT *cpoints = new POINT[n]; - int i; - for (i = 0; i < n; i++) + // Do things less efficiently if we have offsets + if (xoffset != 0 || yoffset != 0) { - cpoints[i].x = (int)(XLOG2DEV(points[i].x + xoffset)); - cpoints[i].y = (int)(YLOG2DEV(points[i].y + yoffset)); + POINT *cpoints = new POINT[n]; + int i; + for (i = 0; i < n; i++) + { + cpoints[i].x = (int)(points[i].x + xoffset); + cpoints[i].y = (int)(points[i].y + yoffset); - CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset); + CalcBoundingBox(cpoints[i].x, cpoints[i].y); + } + (void)Polyline((HDC) m_hDC, cpoints, n); + delete[] cpoints; } + else + { + int i; + for (i = 0; i < n; i++) + CalcBoundingBox(points[i].x, points[i].y); - (void)Polyline((HDC) m_hDC, cpoints, n); - - EndDrawing(); - - delete[] cpoints; + (void)Polyline((HDC) m_hDC, (POINT*) points, n); + } } void wxDC::DrawRectangle(long x, long y, long width, long height) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - long x2 = x + width; long y2 = y + height; - BeginDrawing(); - /* MATTHEW: [6] new normalization */ #if WX_STANDARD_GRAPHICS bool do_brush, do_pen; @@ -622,7 +514,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height) HPEN orig_pen = NULL; if (do_pen || !m_pen.Ok()) - orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN)); + orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN)); (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1); @@ -634,7 +526,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height) HBRUSH orig_brush = NULL; if (do_brush || !m_brush.Ok()) - orig_brush = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_BRUSH)); + orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH)); (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); @@ -648,16 +540,10 @@ void wxDC::DrawRectangle(long x, long y, long width, long height) CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); - - EndDrawing(); } void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double radius) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - // Now, a negative radius value is interpreted to mean // 'the proportion of the smallest X or Y dimension' @@ -674,32 +560,20 @@ void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double long x2 = (x+width); long y2 = (y+height); - BeginDrawing(); - (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius)); CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); - - EndDrawing(); } void wxDC::DrawEllipse(long x, long y, long width, long height) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - long x2 = (x+width); long y2 = (y+height); - BeginDrawing(); - (void)Ellipse((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); - EndDrawing(); - CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); } @@ -707,15 +581,9 @@ void wxDC::DrawEllipse(long x, long y, long width, long height) // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - long x2 = (x+w); long y2 = (y+h); - BeginDrawing(); - const double deg2rad = 3.14159265359 / 180.0; int rx1 = XLOG2DEV(x+w/2); int ry1 = YLOG2DEV(y+h/2); @@ -728,7 +596,7 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) // draw pie with NULL_PEN first and then outline otherwise a line is // drawn from the start and end points to the centre - HPEN orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN)); + HPEN orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN)); if (m_signY > 0) { (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1, @@ -743,30 +611,26 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) (void)Arc((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2), rx1, ry1, rx2, ry2); - EndDrawing(); - CalcBoundingBox(x, y); CalcBoundingBox(x2, y2); } void wxDC::DrawIcon(const wxIcon& icon, long x, long y) { - BeginDrawing(); - ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON()); CalcBoundingBox(x, y); CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight()); - - EndDrawing(); } void wxDC::SetFont(const wxFont& the_font) { - // Release the current font from servitude (decrements the usage count) -// if (m_font.Ok()) -// m_font.ReleaseResource(); - - BeginDrawing(); + // Set the old object temporarily, in case the assignment deletes an object + // that's not yet selected out. + if (m_oldFont) + { + ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont); + m_oldFont = 0; + } m_font = the_font; @@ -779,22 +643,28 @@ void wxDC::SetFont(const wxFont& the_font) if (m_font.Ok() && m_font.GetResourceHandle()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); + if (f == NULL) + { + wxDebugMsg("::SelectObject failed in wxDC::SetFont."); + } if (!m_oldFont) m_oldFont = (WXHFONT) f; } - EndDrawing(); } void wxDC::SetPen(const wxPen& pen) { - BeginDrawing(); - -// if (m_pen.Ok()) -// m_pen.ReleaseResource(); + // Set the old object temporarily, in case the assignment deletes an object + // that's not yet selected out. + if (m_oldPen) + { + ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen); + m_oldPen = 0; + } m_pen = pen; @@ -807,8 +677,6 @@ void wxDC::SetPen(const wxPen& pen) if (m_pen.Ok()) { -// m_pen.UseResource(); -// m_pen.RealizeResource(); if (m_pen.GetResourceHandle()) { HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ; @@ -816,16 +684,17 @@ void wxDC::SetPen(const wxPen& pen) m_oldPen = (WXHPEN) p; } } - - EndDrawing(); } void wxDC::SetBrush(const wxBrush& brush) { - BeginDrawing(); - -// if (m_brush.Ok()) -// m_brush.ReleaseResource(); + // Set the old object temporarily, in case the assignment deletes an object + // that's not yet selected out. + if (m_oldBrush) + { + ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush); + m_oldBrush = 0; + } m_brush = brush; @@ -838,33 +707,30 @@ void wxDC::SetBrush(const wxBrush& brush) if (m_brush.Ok()) { -// m_brush.UseResource(); -// m_brush.RealizeResource(); - if (m_brush.GetResourceHandle()) { HBRUSH b = 0; - b = ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ; + b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ; if (!m_oldBrush) m_oldBrush = (WXHBRUSH) b; } } - EndDrawing(); } void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) { - BeginDrawing(); - + // Should be unnecessary: SetFont should have done this already. +#if 0 if (m_font.Ok() && m_font.GetResourceHandle()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif - HFONT f = ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); + HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); if (!m_oldFont) m_oldFont = (WXHFONT) f; } +#endif if (m_textForegroundColour.Ok()) SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ; @@ -890,23 +756,15 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) long w, h; GetTextExtent(text, &w, &h); CalcBoundingBox((x + w), (y + h)); - - EndDrawing(); } void wxDC::SetBackground(const wxBrush& brush) { -// if (m_backgroundBrush.Ok()) -// m_backgroundBrush.ReleaseResource(); - m_backgroundBrush = brush; if (!m_backgroundBrush.Ok()) return; -// m_backgroundBrush.UseResource(); -// m_backgroundBrush.RealizeResource() ; - if (m_canvas) { bool customColours = TRUE; @@ -917,8 +775,6 @@ void wxDC::SetBackground(const wxBrush& brush) if (customColours) { -// HBRUSH br = (m_backgroundBrush.GetStyle()==wxTRANSPARENT) ? -// GetStockObject(NULL_BRUSH) : (HBRUSH) m_backgroundBrush.GetResourceHandle(); if (m_backgroundBrush.GetStyle()==wxTRANSPARENT) { m_canvas->m_backgroundTransparent = TRUE; @@ -930,39 +786,27 @@ void wxDC::SetBackground(const wxBrush& brush) } } } - BeginDrawing(); - COLORREF new_color = m_backgroundBrush.GetColour().GetPixel() ; { (void)SetBkColor((HDC) m_hDC, new_color); } - - EndDrawing(); } void wxDC::SetBackgroundMode(int mode) { m_backgroundMode = mode; - BeginDrawing(); - if (m_backgroundMode == wxTRANSPARENT) ::SetBkMode((HDC) m_hDC, TRANSPARENT); else ::SetBkMode((HDC) m_hDC, OPAQUE); - - EndDrawing(); } void wxDC::SetLogicalFunction(int function) { m_logicalFunction = function; - BeginDrawing(); - SetRop((WXHDC) m_hDC); - - EndDrawing(); } void wxDC::SetRop(WXHDC dc) @@ -1000,31 +844,40 @@ bool wxDC::StartDoc(const wxString& message) if (!this->IsKindOf(CLASSINFO(wxPrinterDC))) return TRUE; - bool flag = FALSE; - DOCINFO docinfo; docinfo.cbSize = sizeof(DOCINFO); docinfo.lpszDocName = (const char *)message; - docinfo.lpszOutput = (const char *)m_filename; + + if (m_filename.IsEmpty()) + docinfo.lpszOutput = NULL; + else + docinfo.lpszOutput = (const char *)m_filename; + #if defined(__WIN95__) docinfo.lpszDatatype = NULL; docinfo.fwType = 0; #endif - if (m_hDC) flag = (SP_ERROR != + if (!m_hDC) + return FALSE; + + int ret = #ifndef __WIN32__ - ::StartDoc((HDC) m_hDC, &docinfo)); + ::StartDoc((HDC) m_hDC, &docinfo); #else #ifdef UNICODE - ::StartDocW((HDC) m_hDC, &docinfo)); + ::StartDocW((HDC) m_hDC, &docinfo); #else - ::StartDocA((HDC) m_hDC, &docinfo)); + ::StartDocA((HDC) m_hDC, &docinfo); #endif #endif - else flag = FALSE; - - return flag; + if (ret <= 0) + { + DWORD lastError = GetLastError(); + wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError); + } + return (ret > 0); } void wxDC::EndDoc(void) @@ -1081,8 +934,8 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y, GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect); GetTextMetrics((HDC) m_hDC, &tm); - *x = XDEV2LOGREL(sizeRect.cx); - *y = YDEV2LOGREL(sizeRect.cy); + if (x) *x = XDEV2LOGREL(sizeRect.cx); + if (y) *y = YDEV2LOGREL(sizeRect.cy); if (descent) *descent = tm.tmDescent; if (externalLeading) *externalLeading = tm.tmExternalLeading; } @@ -1096,8 +949,6 @@ void wxDC::SetMapMode(int mode) int mm_width = 0; int mm_height = 0; - BeginDrawing(); - pixel_width = GetDeviceCaps((HDC) m_hDC, HORZRES); pixel_height = GetDeviceCaps((HDC) m_hDC, VERTRES); mm_width = GetDeviceCaps((HDC) m_hDC, HORZSIZE); @@ -1105,8 +956,6 @@ void wxDC::SetMapMode(int mode) if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0)) { -// if (!m_hDC && m_canvas) -// m_canvas->ReleaseHDC() ; return; } @@ -1157,8 +1006,6 @@ void wxDC::SetMapMode(int mode) ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL); ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); - - EndDrawing(); } void wxDC::SetUserScale(double x, double y) @@ -1190,11 +1037,7 @@ void wxDC::SetLogicalOrigin(long x, long y) m_logicalOriginX = x; m_logicalOriginY = y; - BeginDrawing(); - ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); - - EndDrawing(); } void wxDC::SetDeviceOrigin(long x, long y) @@ -1202,11 +1045,7 @@ void wxDC::SetDeviceOrigin(long x, long y) m_deviceOriginX = x; m_deviceOriginY = y; - BeginDrawing(); - ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); - - EndDrawing(); } long wxDC::DeviceToLogicalX(long x) const @@ -1304,9 +1143,6 @@ long wxDC::ImplLogicalToDeviceYRel(long y) const bool wxDC::Blit(long xdest, long ydest, long width, long height, wxDC *source, long xsrc, long ysrc, int rop, bool useMask) { - BeginDrawing(); - source->BeginDrawing(); - long xdest1 = xdest; long ydest1 = ydest; long xsrc1 = xsrc; @@ -1365,58 +1201,110 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height, ::SelectObject(dc_mask, 0); ::DeleteDC(dc_mask); #endif - // New code from Chris Breeze, 8/5/98 - - // create a temp buffer bitmap and DCs to access it and the mask - HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); - HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); - HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); - ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); - ::SelectObject(dc_buffer, buffer_bmap); - - // copy dest to buffer - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - (HDC) m_hDC, xdest1, ydest1, SRCCOPY); - - // copy src to buffer using selected raster op - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, dwRop); - - // set masked area in buffer to BLACK (pixel value 0) - COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); - COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); - ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - - // set unmasked area in dest to BLACK - ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); - ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); - ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, SRCAND); - ::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values - ::SetTextColor((HDC) m_hDC, prevCol); - - // OR buffer to dest - success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_buffer, 0, 0, SRCPAINT) != 0); - - // tidy up temporary DCs and bitmap - ::SelectObject(dc_mask, 0); - ::DeleteDC(dc_mask); - ::SelectObject(dc_buffer, 0); - ::DeleteDC(dc_buffer); - ::DeleteObject(buffer_bmap); - } + // New code from Chris Breeze, 15/7/98 + // Blit bitmap with mask + + if (IsKindOf(CLASSINFO(wxPrinterDC))) + { + // If we are printing source colours are screen colours + // not printer colours and so we need copy the bitmap + // pixel by pixel. + RECT rect; + HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); + HDC dc_src = (HDC) source->m_hDC; + + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { + COLORREF cref = ::GetPixel(dc_mask, x, y); + if (cref) + { + HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); + rect.left = xdest1 + x; rect.right = rect.left + 1; + rect.top = ydest1 + y; rect.bottom = rect.top + 1; + ::FillRect((HDC) m_hDC, &rect, brush); + ::DeleteObject(brush); + } + } + } + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + } + else + { + // create a temp buffer bitmap and DCs to access it and the mask + HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC); + HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC); + HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height); + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + ::SelectObject(dc_buffer, buffer_bmap); + + // copy dest to buffer + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + (HDC) m_hDC, xdest1, ydest1, SRCCOPY); + + // copy src to buffer using selected raster op + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + (HDC) source->m_hDC, xsrc1, ysrc1, dwRop); + + // set masked area in buffer to BLACK (pixel value 0) + COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255)); + COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0)); + ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + + // set unmasked area in dest to BLACK + ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0)); + ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255)); + ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + ::SetBkColor((HDC) m_hDC, prevBkCol); // restore colours to original values + ::SetTextColor((HDC) m_hDC, prevCol); + + // OR buffer to dest + success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, + dc_buffer, 0, 0, SRCPAINT) != 0); + + // tidy up temporary DCs and bitmap + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); + ::SelectObject(dc_buffer, 0); + ::DeleteDC(dc_buffer); + ::DeleteObject(buffer_bmap); + } + } } else { + if (IsKindOf(CLASSINFO(wxPrinterDC))) + { + // If we are printing source colours are screen colours + // not printer colours and so we need copy the bitmap + // pixel by pixel. + HDC dc_src = (HDC) source->m_hDC; + RECT rect; + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { + HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); + rect.left = xdest1 + x; rect.right = rect.left + 1; + rect.top = ydest1 + y; rect.bottom = rect.top + 1; + ::FillRect((HDC) m_hDC, &rect, brush); + ::DeleteObject(brush); + } + } + } + else + { success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, xsrc1, ysrc1, dwRop) != 0); + } } ::SetTextColor((HDC)m_hDC, old_textground); ::SetBkColor((HDC)m_hDC, old_background); - source->EndDrawing(); - EndDrawing(); return success; } @@ -1437,20 +1325,6 @@ void wxDC::GetSizeMM(long *width, long *height) const *height = h; } -/* -#if USE_SPLINES -# if USE_XFIG_SPLINE_CODE -# include "../common/xfspline.inc" -# else -# include "../common/wxspline.inc" -# endif -#endif // USE_SPLINES -*/ - -#if USE_SPLINES -#include "xfspline.inc" -#endif // USE_SPLINES - void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle) { int n = list->Number(); @@ -1491,40 +1365,6 @@ void wxDC::SetTextBackground(const wxColour& colour) m_textBackgroundColour = colour; } -#if USE_SPLINES -// Make a 3-point spline -void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3) -{ - wxList *point_list = new wxList; - - 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; - } - delete point_list; -/* - wxSpline spline(point_list); - - wx_draw_open_spline(this, &spline); - spline.DeletePoints(); - */ -} -#endif - // For use by wxWindows only, unless custom units are required. void wxDC::SetLogicalScale(double x, double y) { @@ -1568,3 +1408,279 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y, } #endif +int wxDC::GetDepth(void) const +{ + return (int) ::GetDeviceCaps((HDC) m_hDC,BITSPIXEL); +} + +#if wxUSE_SPLINES + +// Make a 3-point spline +void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3) +{ + wxList *point_list = new wxList; + + 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; + } + delete point_list; +} + +////#define wx_round(a) (int)((a)+.5) +//#define wx_round(a) (a) + +class wxSpline: public wxObject +{ + public: + int type; + wxList *points; + + wxSpline(wxList *list); + void DeletePoints(void); + + // Doesn't delete points + ~wxSpline(void); +}; + +void wxDC::DrawSpline(int n, wxPoint points[]) +{ + wxList list; + int i; + for (i =0; i < n; i++) + list.Append((wxObject*)&points[i]); + DrawSpline((wxList *)&list); +} + +void wx_draw_open_spline(wxDC *dc, wxSpline *spline); + +void wx_quadratic_spline(double a1, double b1, double a2, double b2, + double a3, double b3, double a4, double b4); +void wx_clear_stack(void); +int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3, + double *y3, double *x4, double *y4); +void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, + double x4, double y4); +static bool wx_spline_add_point(double x, double y); +static void wx_spline_draw_point_array(wxDC *dc); +wxSpline *wx_make_spline(int x1, int y1, int x2, int y2, int x3, int y3); + +void wxDC::DrawSpline(wxList *list) +{ + wxSpline spline(list); + + wx_draw_open_spline(this, &spline); +} + + +wxList wx_spline_point_list; + +void wx_draw_open_spline(wxDC *dc, wxSpline *spline) +{ + wxPoint *p; + double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; + double x1, y1, x2, y2; + + wxNode *node = spline->points->First(); + p = (wxPoint *)node->Data(); + + x1 = p->x; + y1 = p->y; + + node = node->Next(); + p = (wxPoint *)node->Data(); + + x2 = p->x; + y2 = p->y; + cx1 = (double)((x1 + x2) / 2); + cy1 = (double)((y1 + y2) / 2); + cx2 = (double)((cx1 + x2) / 2); + cy2 = (double)((cy1 + y2) / 2); + + wx_spline_add_point(x1, y1); + + while ((node = node->Next()) != NULL) + { + p = (wxPoint *)node->Data(); + x1 = x2; + y1 = y2; + x2 = p->x; + y2 = p->y; + cx4 = (double)(x1 + x2) / 2; + cy4 = (double)(y1 + y2) / 2; + cx3 = (double)(x1 + cx4) / 2; + cy3 = (double)(y1 + cy4) / 2; + + wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4); + + cx1 = cx4; + cy1 = cy4; + cx2 = (double)(cx1 + x2) / 2; + cy2 = (double)(cy1 + y2) / 2; + } + + wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1)); + wx_spline_add_point(x2, y2); + + wx_spline_draw_point_array(dc); + +} + +/********************* CURVES FOR SPLINES ***************************** + + The following spline drawing routine is from + + "An Algorithm for High-Speed Curve Generation" + by George Merrill Chaikin, + Computer Graphics and Image Processing, 3, Academic Press, + 1974, 346-349. + + and + + "On Chaikin's Algorithm" by R. F. Riesenfeld, + Computer Graphics and Image Processing, 4, Academic Press, + 1975, 304-310. + +***********************************************************************/ + +#define half(z1, z2) ((z1+z2)/2.0) +#define THRESHOLD 5 + +/* iterative version */ + +void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4, + double b4) +{ + register double xmid, ymid; + double x1, y1, x2, y2, x3, y3, x4, y4; + + wx_clear_stack(); + wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4); + + while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) { + xmid = (double)half(x2, x3); + ymid = (double)half(y2, y3); + if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD && + fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) { + wx_spline_add_point((double)wx_round(x1), (double)wx_round(y1)); + wx_spline_add_point((double)wx_round(xmid), (double)wx_round(ymid)); + } else { + wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3), + (double)half(x3, x4), (double)half(y3, y4), x4, y4); + wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2), + (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid); + } + } +} + + +/* utilities used by spline drawing routines */ + + +typedef struct wx_spline_stack_struct { + double x1, y1, x2, y2, x3, y3, x4, y4; +} + Stack; + +#define SPLINE_STACK_DEPTH 20 +static Stack wx_spline_stack[SPLINE_STACK_DEPTH]; +static Stack *wx_stack_top; +static int wx_stack_count; + +void wx_clear_stack(void) +{ + wx_stack_top = wx_spline_stack; + wx_stack_count = 0; +} + +void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) +{ + wx_stack_top->x1 = x1; + wx_stack_top->y1 = y1; + wx_stack_top->x2 = x2; + wx_stack_top->y2 = y2; + wx_stack_top->x3 = x3; + wx_stack_top->y3 = y3; + wx_stack_top->x4 = x4; + wx_stack_top->y4 = y4; + wx_stack_top++; + wx_stack_count++; +} + +int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, + double *x3, double *y3, double *x4, double *y4) +{ + if (wx_stack_count == 0) + return (0); + wx_stack_top--; + wx_stack_count--; + *x1 = wx_stack_top->x1; + *y1 = wx_stack_top->y1; + *x2 = wx_stack_top->x2; + *y2 = wx_stack_top->y2; + *x3 = wx_stack_top->x3; + *y3 = wx_stack_top->y3; + *x4 = wx_stack_top->x4; + *y4 = wx_stack_top->y4; + return (1); +} + +static bool wx_spline_add_point(double x, double y) +{ + wxPoint *point = new wxPoint ; + point->x = (int) x; + point->y = (int) y; + wx_spline_point_list.Append((wxObject*)point); + return TRUE; +} + +static void wx_spline_draw_point_array(wxDC *dc) +{ + dc->DrawLines(&wx_spline_point_list, (double)0.0, (double)0.0); + wxNode *node = wx_spline_point_list.First(); + while (node) + { + wxPoint *point = (wxPoint *)node->Data(); + delete point; + delete node; + node = wx_spline_point_list.First(); + } +} + +wxSpline::wxSpline(wxList *list) +{ + points = list; +} + +wxSpline::~wxSpline(void) +{ +} + +void wxSpline::DeletePoints(void) +{ + for(wxNode *node = points->First(); node; node = points->First()) + { + wxPoint *point = (wxPoint *)node->Data(); + delete point; + delete node; + } + delete points; +} + + +#endif // wxUSE_SPLINES +