X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f65e33794fca0c936227235515a40e7df5c56e3..c9057ae1c565cc4ae6c2cf84dd19d65a64ee2b7b:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 075c62ee0f..7216cb8f69 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -6,153 +6,112 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "dc.h" + #pragma implementation "dc.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/frame.h" -#include "wx/dc.h" -#include "wx/utils.h" -#include "wx/dialog.h" -#include "wx/app.h" + #include "wx/window.h" + #include "wx/dc.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/app.h" + #include "wx/bitmap.h" + #include "wx/dcmemory.h" + #include "wx/log.h" + #include "wx/icon.h" #endif #include "wx/dcprint.h" -#include "wx/msw/private.h" #include #include -#include -#if USE_COMMON_DIALOGS -#include +#if wxUSE_COMMON_DIALOGS +#if wxUSE_NORLANDER_HEADERS + #include +#endif + #include #endif #ifndef __WIN32__ -#include + #include #endif -#ifdef DrawText -#undef DrawText -#endif +#include "wx/msw/private.h" -#ifdef GetCharWidth -#undef GetCharWidth +#if !USE_SHARED_LIBRARY + IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #endif -#ifdef StartDoc -#undef StartDoc -#endif +// --------------------------------------------------------------------------- +// constants +// --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif +static const int VIEWPORT_EXTENT = 1000; -// Declarations local to this file +static const int MM_POINTS = 9; +static const int MM_METRIC = 10; -#define YSCALE(y) (yorigin - (y)) +// =========================================================================== +// implementation +// =========================================================================== -// #define wx_round(a) (int)((a)+.5) +// --------------------------------------------------------------------------- +// wxDC +// --------------------------------------------------------------------------- // Default constructor -wxDC::wxDC(void) +wxDC::wxDC() { - // 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_canvas = NULL; - m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0; - m_clipping = FALSE; - m_autoSetting = TRUE ; -// m_scaleGDI = TRUE; + m_oldBitmap = 0; + m_oldPen = 0; + m_oldBrush = 0; + m_oldFont = 0; + m_oldPalette = 0; - 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; - m_deviceOriginY = 0; - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - m_userScaleX = 1.0; - m_userScaleY = 1.0; - m_signX = 1; - m_signY = 1; - m_systemScaleX = 1.0; - m_systemScaleY = 1.0; - m_mappingMode = MM_TEXT; -// m_dontDelete = FALSE; - m_bOwnsDC = FALSE; - m_hDC = 0; - m_clipping = FALSE; - m_ok = TRUE; - m_windowExtX = VIEWPORT_EXTENT; - m_windowExtY = VIEWPORT_EXTENT; - m_logicalFunction = -1; - - m_backgroundBrush = *wxWHITE_BRUSH; -// m_backgroundBrush.UseResource(); - - m_textForegroundColour = *wxBLACK; - m_textBackgroundColour = *wxWHITE; - - m_colour = wxColourDisplay(); - - m_hDCCount = 0; -} - - -wxDC::~wxDC(void) -{ - if ( m_hDC != 0 ) { - SelectOldObjects(m_hDC); - if ( m_bOwnsDC ) { - if ( m_canvas == NULL ) - ::DeleteDC((HDC)m_hDC); - else - ::ReleaseDC((HWND)m_canvas->GetHWND(), (HDC)m_hDC); + m_bOwnsDC = FALSE; + m_hDC = 0; + + m_windowExtX = VIEWPORT_EXTENT; + m_windowExtY = VIEWPORT_EXTENT; + + m_hDCCount = 0; +} + + +wxDC::~wxDC() +{ + if ( m_hDC != 0 ) { + SelectOldObjects(m_hDC); + if ( m_bOwnsDC ) { + if ( m_canvas == NULL ) + ::DeleteDC(GetHdc()); + else + ::ReleaseDC((HWND)m_canvas->GetHWND(), GetHdc()); + } } - } -/* - if (m_hDC) - { - SelectOldObjects(m_hDC); - ::DeleteDC((HDC) m_hDC); - } -*/ } // This will select current objects out of the DC, @@ -160,954 +119,746 @@ wxDC::~wxDC(void) // DC. void wxDC::SelectOldObjects(WXHDC dc) { -#if DEBUG > 1 - wxDebugMsg("wxDC::SelectOldObjects %X\n", this); -#endif - if (dc) - { - if (m_oldBitmap) + if (dc) { -#if DEBUG > 1 - wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBITMAP %X\n", m_oldBitmap); -#endif - ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); - if (m_selectedBitmap.Ok()) - { - m_selectedBitmap.SetSelectedInto(NULL); - } - } - m_oldBitmap = 0 ; - if (m_oldPen) - { -#if DEBUG > 1 - wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPEN %X\n", m_oldPen); -#endif - ::SelectObject((HDC) dc, (HPEN) m_oldPen); - } - m_oldPen = 0 ; - if (m_oldBrush) - { -#if DEBUG > 1 - wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBRUSH %X\n", m_oldBrush); -#endif - ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush); + if (m_oldBitmap) + { + ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); + if (m_selectedBitmap.Ok()) + { + m_selectedBitmap.SetSelectedInto(NULL); + } + } + m_oldBitmap = 0; + if (m_oldPen) + { + ::SelectObject((HDC) dc, (HPEN) m_oldPen); + } + m_oldPen = 0; + if (m_oldBrush) + { + ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush); + } + m_oldBrush = 0; + if (m_oldFont) + { + ::SelectObject((HDC) dc, (HFONT) m_oldFont); + } + m_oldFont = 0; + if (m_oldPalette) + { + ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE); + } + m_oldPalette = 0; } - m_oldBrush = 0 ; - if (m_oldFont) - { -#if DEBUG > 1 - wxDebugMsg("wxDC::SelectOldObjects: Selecting old HFONT %X\n", m_oldFont); -#endif - ::SelectObject((HDC) dc, (HFONT) m_oldFont); - } - m_oldFont = 0 ; - if (m_oldPalette) - { -#if DEBUG > 1 - wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPALETTE %X\n", m_oldPalette); -#endif - ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE); - } -#if DEBUG > 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; - m_palette = wxNullPalette; - m_font = wxNullFont; - m_backgroundBrush = wxNullBrush; - m_selectedBitmap = wxNullBitmap; + m_brush = wxNullBrush; + m_pen = wxNullPen; + m_palette = wxNullPalette; + m_font = wxNullFont; + m_backgroundBrush = wxNullBrush; + m_selectedBitmap = wxNullBitmap; } -void wxDC::SetClippingRegion(long cx, long cy, long cw, long ch) +// --------------------------------------------------------------------------- +// clipping +// --------------------------------------------------------------------------- + +void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch) { - m_clipping = TRUE; - m_clipX1 = (int)cx; - m_clipY1 = (int)cy; - m_clipX2 = (int)(cx + cw); - m_clipY2 = (int)(cy + ch); + m_clipping = TRUE; + m_clipX1 = (int)cx; + m_clipY1 = (int)cy; + m_clipX2 = (int)(cx + cw); + m_clipY2 = (int)(cy + ch); - BeginDrawing(); + DoClipping((WXHDC) m_hDC); +} - DoClipping((WXHDC) m_hDC); +void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) +{ + wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") ); - EndDrawing(); + wxRect box = region.GetBox(); + + m_clipping = TRUE; + m_clipX1 = box.x; + m_clipY1 = box.y; + m_clipX2 = box.x + box.width; + m_clipY2 = box.y + box.height; + +#ifdef __WIN16__ + SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN()); +#else + ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND); +#endif } void wxDC::DoClipping(WXHDC dc) { - if (m_clipping && 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) + if (m_clipping && dc) { - m_canvas->CalcScrolledPosition(0, 0, &x_off, &y_off); + IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1), + XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2)); } -// 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) +void wxDC::DestroyClippingRegion() { - BeginDrawing(); - - if (m_clipping && m_hDC) - { -// SelectClipRgn(dc, NULL); - HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); -#if DEBUG > 1 - wxDebugMsg("wxDC::DestroyClippingRegion: Selecting HRGN %X\n", rgn); -#endif - SelectClipRgn((HDC) m_hDC, rgn); -#if DEBUG > 1 - wxDebugMsg("wxDC::DestroyClippingRegion: Deleting HRGN %X\n", rgn); -#endif - DeleteObject(rgn); - } - m_clipping = FALSE; - - EndDrawing(); + if (m_clipping && m_hDC) + { + // TODO: this should restore the previous clipping region, + // so that OnPaint processing works correctly, and the update clipping region + // doesn't get destroyed after the first DestroyClippingRegion. + HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); + SelectClipRgn(GetHdc(), rgn); + DeleteObject(rgn); + } + m_clipping = FALSE; } -bool wxDC::CanDrawBitmap(void) const +// --------------------------------------------------------------------------- +// query capabilities +// --------------------------------------------------------------------------- + +bool wxDC::CanDrawBitmap() const { - return TRUE; + return TRUE; } -bool wxDC::CanGetTextExtent(void) const +bool wxDC::CanGetTextExtent() const { - // What sort of display is it? - int technology = ::GetDeviceCaps((HDC) m_hDC, TECHNOLOGY); - - bool ok; - - if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER) - ok = FALSE; - else ok = TRUE; + // What sort of display is it? + int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY); - return ok; + return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER); } -void wxDC::SetPalette(const wxPalette& palette) +int wxDC::GetDepth() const { - BeginDrawing(); + return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL); +} - m_palette = m_palette; +// --------------------------------------------------------------------------- +// drawing +// --------------------------------------------------------------------------- - if (!m_palette.Ok()) - { - // Setting a NULL colourmap is a way of restoring - // the original colourmap - if (m_oldPalette) +void wxDC::Clear() +{ + RECT rect; + if ( m_canvas ) { - ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE); -#if DEBUG > 1 - wxDebugMsg("wxDC::SetPalette: set old palette %X\n", m_oldPalette); -#endif - m_oldPalette = 0; + GetClientRect((HWND) m_canvas->GetHWND(), &rect); } + else + { + wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") ); - return; - } - - if (m_palette.Ok() && m_palette.GetHPALETTE()) - { - HPALETTE oldPal = ::SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), TRUE); - if (!m_oldPalette) - m_oldPalette = (WXHPALETTE) oldPal; - -#if DEBUG > 1 - wxDebugMsg("wxDC::SetPalette %X: selected palette %X\n", this, m_palette.GetHPALETTE()); - if (oldPal) - wxDebugMsg("wxDC::SetPalette: oldPal was palette %X\n", oldPal); - if (m_oldPalette) - wxDebugMsg("wxDC::SetPalette: m_oldPalette is palette %X\n", m_oldPalette); -#endif - ::RealizePalette((HDC) m_hDC); - } - - EndDrawing(); -} - -void wxDC::Clear(void) -{ - BeginDrawing(); - - RECT rect; - if (m_canvas) - GetClientRect((HWND) m_canvas->GetHWND(), &rect); - else if (m_selectedBitmap.Ok()) - { - rect.left = 0; rect.top = 0; - rect.right = m_selectedBitmap.GetWidth(); - rect.bottom = m_selectedBitmap.GetHeight(); - } - (void) ::SetMapMode((HDC) m_hDC, MM_TEXT); + rect.left = 0; rect.top = 0; + rect.right = m_selectedBitmap.GetWidth(); + rect.bottom = m_selectedBitmap.GetHeight(); + } - DWORD colour = GetBkColor((HDC) m_hDC); - HBRUSH brush = CreateSolidBrush(colour); - FillRect((HDC) m_hDC, &rect, brush); - DeleteObject(brush); + (void) ::SetMapMode(GetHdc(), MM_TEXT); - ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC); - ::SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL); - ::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); + DWORD colour = GetBkColor(GetHdc()); + HBRUSH brush = CreateSolidBrush(colour); + FillRect(GetHdc(), &rect, brush); + DeleteObject(brush); - EndDrawing(); + ::SetMapMode(GetHdc(), MM_ANISOTROPIC); + ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL); + ::SetWindowExtEx(GetHdc(), m_windowExtX, m_windowExtY, NULL); + ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); + ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); } -void wxDC::FloodFill(long x, long y, wxColour *col, int style) +void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) { -// int xx = (int)x; -// int yy = (int)y; - - if (m_brush.Ok() && m_autoSetting) - SetBrush(m_brush); + (void)ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), + col.GetPixel(), + style == wxFLOOD_SURFACE ? FLOODFILLSURFACE + : FLOODFILLBORDER); -// if (m_canvas) -// m_canvas->CalcScrolledPosition((int)x, (int)y, &xx, &yy); + CalcBoundingBox(x, y); +} - BeginDrawing(); +bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const +{ + // added by steve 29.12.94 (copied from DrawPoint) + // returns TRUE for pixels in the color of the current pen + // and FALSE for all other pixels colors + // if col is non-NULL return the color of the pixel - (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), - col->GetPixel(), - style==wxFLOOD_SURFACE? - FLOODFILLSURFACE:FLOODFILLBORDER - ); + // get the color of the pixel + COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)); + // get the color of the pen + COLORREF pencolor = 0x00ffffff; + if (m_pen.Ok()) + { + pencolor = m_pen.GetColour().GetPixel(); + } - EndDrawing(); + // return the color of the pixel + if(col) + col->Set(GetRValue(pixelcolor),GetGValue(pixelcolor),GetBValue(pixelcolor)); - CalcBoundingBox(x, y); + // check, if color of the pixels is the same as the color + // of the current pen + return(pixelcolor==pencolor); } -bool wxDC::GetPixel(long x, long y, wxColour *col) const +void wxDC::DoCrossHair(wxCoord x, wxCoord y) { - // added by steve 29.12.94 (copied from DrawPoint) - // returns TRUE for pixels in the color of the current pen - // and FALSE for all other pixels colors - // if col is non-NULL return the color of the pixel -/* - int xx1 = (int)x; - int yy1 = (int)y; - if (m_canvas) - m_canvas->CalcScrolledPosition((int)x, (int)y, &xx1, &yy1); -*/ - - // get the color of the pixel - COLORREF pixelcolor = ::GetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y)); - // get the color of the pen - COLORREF pencolor = 0x00ffffff; - if (m_pen.Ok()) - { - pencolor = m_pen.GetColour().GetPixel() ; - } - - // return the color of the pixel - if(col) - col->Set(GetRValue(pixelcolor),GetGValue(pixelcolor),GetBValue(pixelcolor)); - - // check, if color of the pixels is the same as the color - // of the current pen - return(pixelcolor==pencolor); -} - -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; -/* - long xx1 = x1 ; - long yy1 = y1 ; - long xx2 = x2 ; - long yy2 = y2 ; - long xx = x ; - long yy = y ; - - if (m_canvas) - { - m_canvas->CalcScrolledPosition(x1, y1, &xx1, &yy1); - m_canvas->CalcScrolledPosition(x2, y2, &xx2, &yy2); - m_canvas->CalcScrolledPosition(x, y, &xx, &yy); - } -*/ - - BeginDrawing(); - - (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL); - (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y)); + wxCoord x1 = x-VIEWPORT_EXTENT; + wxCoord y1 = y-VIEWPORT_EXTENT; + wxCoord x2 = x+VIEWPORT_EXTENT; + wxCoord y2 = y+VIEWPORT_EXTENT; - (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL); - (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2)); + (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL); + (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y)); - EndDrawing(); + (void)MoveToEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), NULL); + (void)LineTo(GetHdc(), XLOG2DEV(x), YLOG2DEV(y2)); - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); + CalcBoundingBox(x1, y1); + CalcBoundingBox(x2, y2); } -void wxDC::DrawLine(long x1, long y1, long x2, long y2) +void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { -// BUGBUG - is this necessary? YES YES YES YEs Yes yes ye.... - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen); -/* - int xx1 = (int)x1; - int yy1 = (int)y1; - int xx2 = (int)x2; - int yy2 = (int)y2; - if (m_canvas) - { - m_canvas->CalcScrolledPosition((int)x1, (int)y1, &xx1, &yy1); - m_canvas->CalcScrolledPosition((int)x2, (int)y2, &xx2, &yy2); - } -*/ - - BeginDrawing(); + (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL); + (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2)); - (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y1), NULL); - (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y2)); - - /* MATTHEW: [6] New normalization */ + /* MATTHEW: [6] New normalization */ #if WX_STANDARD_GRAPHICS - (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2)); + (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2)); #endif - EndDrawing(); - - CalcBoundingBox(x1, y1); - CalcBoundingBox(x2, y2); + CalcBoundingBox(x1, y1); + CalcBoundingBox(x2, y2); } -void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc) +void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc) { -/* - int xx1 = (int)x1; - int yy1 = (int)y1; - int xx2 = (int)x2; - int yy2 = (int)y2; - int xxc = (int)xc ; - int yyc = (int)yc; -*/ - - double dx = xc-x1 ; - double dy = yc-y1 ; - double radius = (double)sqrt(dx*dx+dy*dy) ;; - if (x1==x2 && x2==y2) - { - DrawEllipse(xc,yc,(double)(radius*2.0),(double)(radius*2)) ; - return ; - } - -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - -/* - if (m_canvas) - { - m_canvas->CalcScrolledPosition((int)x1, (int)y1, &xx1, &yy1); - m_canvas->CalcScrolledPosition((int)x2, (int)y2, &xx2, &yy2); - m_canvas->CalcScrolledPosition((int)xc, (int)yc, &xxc, &yyc); - } -*/ - - BeginDrawing(); - - long xx1 = XLOG2DEV(x1) ; - long yy1 = YLOG2DEV(y1) ; - long xx2 = XLOG2DEV(x2) ; - long yy2 = YLOG2DEV(y2) ; - long xxc = XLOG2DEV(xc) ; - long yyc = YLOG2DEV(yc) ; - long ray = (long) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))) ; - - (void)MoveToEx((HDC) m_hDC, (int) xx1, (int) yy1, NULL); - long xxx1 = (long) (xxc-ray); - long yyy1 = (long) (yyc-ray); - long xxx2 = (long) (xxc+ray); - 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, - 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) ; - -/* - int xx1 = (int)x; - int yy1 = (int)y; - if (m_canvas) - m_canvas->CalcScrolledPosition((int)x, (int)y, &xx1, &yy1); -*/ - - BeginDrawing(); + double dx = xc-x1; + double dy = yc-y1; + double radius = (double)sqrt(dx*dx+dy*dy) ;; + if (x1==x2 && x2==y2) + { + DrawEllipse(xc,yc,(wxCoord)(radius*2.0),(wxCoord)(radius*2.0)); + return; + } - COLORREF color = 0x00ffffff; - if (m_pen.Ok()) - { -// m_pen.RealizeResource(); - color = m_pen.GetColour().GetPixel() ; - } + wxCoord xx1 = XLOG2DEV(x1); + wxCoord yy1 = YLOG2DEV(y1); + wxCoord xx2 = XLOG2DEV(x2); + wxCoord yy2 = YLOG2DEV(y2); + wxCoord xxc = XLOG2DEV(xc); + wxCoord yyc = YLOG2DEV(yc); + wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))); + + (void)MoveToEx(GetHdc(), (int) xx1, (int) yy1, NULL); + wxCoord xxx1 = (wxCoord) (xxc-ray); + wxCoord yyy1 = (wxCoord) (yyc-ray); + wxCoord xxx2 = (wxCoord) (xxc+ray); + wxCoord yyy2 = (wxCoord) (yyc+ray); + if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT) + { + // 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(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, + xx1,yy1,xx2,yy2); + } + else + Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, + xx1,yy1,xx2,yy2); -/* - color = RGB(m_pen->GetColour().Red(), - m_pen->GetColour().Green(), - m_pen->GetColour().Blue()); -*/ + CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius)); + CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius)); +} - SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color); +void wxDC::DoDrawPoint(wxCoord x, wxCoord y) +{ + COLORREF color = 0x00ffffff; + if (m_pen.Ok()) + { + color = m_pen.GetColour().GetPixel(); + } - EndDrawing(); + SetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), color); - CalcBoundingBox(x, y); + CalcBoundingBox(x, y); } -void wxDC::DrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle) +void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; -/* - int xoffset1 = 0; - int yoffset1 = 0; - - if (m_canvas) - m_canvas->CalcScrolledPosition(0, 0, &xoffset1, &yoffset1); - - xoffset1 += (int)xoffset; yoffset1 += (int)yoffset; -*/ + // Do things less efficiently if we have offsets + if (xoffset != 0 || yoffset != 0) + { + 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(cpoints[i].x, cpoints[i].y); + } + int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); + (void)Polygon(GetHdc(), cpoints, n); + SetPolyFillMode(GetHdc(),prev); + delete[] cpoints; + } + else + { + int i; + for (i = 0; i < n; i++) + CalcBoundingBox(points[i].x, points[i].y); - BeginDrawing(); + int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING); + (void)Polygon(GetHdc(), (POINT*) points, n); + SetPolyFillMode(GetHdc(),prev); + } +} - POINT *cpoints = new POINT[n]; - int i; - for (i = 0; i < n; i++) - { - cpoints[i].x = (int)(XLOG2DEV(points[i].x)); - cpoints[i].y = (int)(YLOG2DEV(points[i].y)); +void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +{ + // Do things less efficiently if we have offsets + if (xoffset != 0 || yoffset != 0) + { + 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(cpoints[i].x, cpoints[i].y); + } + (void)Polyline(GetHdc(), cpoints, n); + delete[] cpoints; + } + else + { + int i; + for (i = 0; i < n; i++) + CalcBoundingBox(points[i].x, points[i].y); - CalcBoundingBox(points[i].x, points[i].y); - } + (void)Polyline(GetHdc(), (POINT*) points, n); + } +} - int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ; - (void)Polygon((HDC) m_hDC, cpoints, n); - SetPolyFillMode((HDC) m_hDC,prev) ; +void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +{ + wxCoord x2 = x + width; + wxCoord y2 = y + height; - EndDrawing(); + /* MATTHEW: [6] new normalization */ +#if WX_STANDARD_GRAPHICS + bool do_brush, do_pen; - delete[] cpoints; -} + do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT; + do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT; -void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long yoffset) -{ -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; + if (do_brush) { + HPEN orig_pen = NULL; -/* - int xoffset1 = 0; - int yoffset1 = 0; - - if (m_canvas) - { - m_canvas->CalcScrolledPosition(0, 0, &xoffset1, &yoffset1); - } - xoffset1 += (int)xoffset; yoffset1 += (int)yoffset; -*/ + if (do_pen || !m_pen.Ok()) + orig_pen = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN)); - BeginDrawing(); + (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1); - POINT *cpoints = new POINT[n]; - int i; - for (i = 0; i < n; i++) - { - cpoints[i].x = (int)(XLOG2DEV(points[i].x)); - cpoints[i].y = (int)(YLOG2DEV(points[i].y)); + if (do_pen || !m_pen.Ok()) + ::SelectObject(GetHdc() , orig_pen); + } + if (do_pen) { + HBRUSH orig_brush = NULL; - CalcBoundingBox(points[i].x, points[i].y); - } + if (do_brush || !m_brush.Ok()) + orig_brush = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH) ::GetStockObject(NULL_BRUSH)); - (void)Polyline((HDC) m_hDC, cpoints, n); + (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x2), YLOG2DEV(y2)); - EndDrawing(); + if (do_brush || !m_brush.Ok()) + ::SelectObject(GetHdc(), orig_brush); + } +#else + (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); +#endif - delete[] cpoints; + CalcBoundingBox(x, y); + CalcBoundingBox(x2, y2); } -void wxDC::DrawRectangle(long x, long y, long width, long height) +void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; - -/* - int x1 = (int)x; - int y1 = (int)y; - int x2 = (int)(x+width); - int y2 = (int)(y+height); - - if (m_canvas) - { - m_canvas->CalcScrolledPosition((int)x, (int)y, &x1, &y1); - m_canvas->CalcScrolledPosition((int)(x+width), (int)(y+height), &x2, &y2); - } -*/ - long x2 = x + width; - long y2 = y + height; + // Now, a negative radius value is interpreted to mean + // 'the proportion of the smallest X or Y dimension' - BeginDrawing(); + if (radius < 0.0) + { + double smallest = 0.0; + if (width < height) + smallest = width; + else + smallest = height; + radius = (- radius * smallest); + } -/* MATTHEW: [6] new normalization */ -#if WX_STANDARD_GRAPHICS - bool do_brush, do_pen; + wxCoord x2 = (x+width); + wxCoord y2 = (y+height); - do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT; - do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT; + (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), + YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius))); - if (do_brush) { - HPEN orig_pen = NULL; + CalcBoundingBox(x, y); + CalcBoundingBox(x2, y2); +} - if (do_pen || !m_pen.Ok()) - orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN)); +void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +{ + wxCoord x2 = (x+width); + wxCoord y2 = (y+height); - (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1); + (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); - if (do_pen || !m_pen.Ok()) - ::SelectObject((HDC) m_hDC , orig_pen); - } - if (do_pen) { - HBRUSH orig_brush = NULL; + CalcBoundingBox(x, y); + CalcBoundingBox(x2, y2); +} - if (do_brush || !m_brush.Ok()) - orig_brush = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_BRUSH)); +// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows +void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +{ + wxCoord x2 = (x+w); + wxCoord y2 = (y+h); + + const double deg2rad = 3.14159265359 / 180.0; + int rx1 = XLOG2DEV(x+w/2); + int ry1 = YLOG2DEV(y+h/2); + int rx2 = rx1; + int ry2 = ry1; + rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad)); + ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad)); + rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad)); + ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad)); + + // 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 = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN)); + if (m_signY > 0) + { + (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1, + rx1, ry1, rx2, ry2); + } + else + { + (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2), + rx1, ry1-1, rx2, ry2-1); + } + ::SelectObject(GetHdc(), orig_pen); + (void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2), + rx1, ry1, rx2, ry2); - (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x2), YLOG2DEV(y2)); + CalcBoundingBox(x, y); + CalcBoundingBox(x2, y2); +} - if (do_brush || !m_brush.Ok()) - ::SelectObject((HDC) m_hDC, orig_brush); - } +void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) +{ +#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__) + ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(), + icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL); #else - (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); + ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON()); #endif - CalcBoundingBox(x, y); - CalcBoundingBox(x2, y2); - - EndDrawing(); + CalcBoundingBox(x, y); + CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight()); } -void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double radius) +void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { -// 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' - - if (radius < 0.0) - { - double smallest = 0.0; - if (width < height) - smallest = width; - else - smallest = height; - radius = (- radius * smallest); - } - -/* - int x1 = (int)x; - int y1 = (int)y; - - if (m_canvas) - { - m_canvas->CalcScrolledPosition((int)x, (int)y, &x1, &y1); - m_canvas->CalcScrolledPosition((int)(x+width), (int)(y+height), &x2, &y2); - } -*/ - - long x2 = (x+width); - long y2 = (y+height); + if (!bmp.Ok()) + return; - BeginDrawing(); - - (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), - YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius)); + // If we're not drawing transparently, and not drawing to a printer, + // optimize this function to use Windows functions. + if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC))) + { + HDC cdc = GetHdc(); + HDC memdc = ::CreateCompatibleDC( cdc ); + HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); - CalcBoundingBox(x, y); - CalcBoundingBox(x2, y2); + wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); - EndDrawing(); + ::SelectObject( memdc, hbitmap ); + ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY); + ::DeleteDC( memdc ); + } + else + { + // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level + wxMemoryDC memDC; + memDC.SelectObject(bmp); + + /* Not sure if we need this. The mask should leave the + * masked areas as per the original background of this DC. + */ + /* + // There might be transparent areas, so make these + // the same colour as this DC + memDC.SetBackground(* GetBackground()); + memDC.Clear(); + */ + + Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask); + + memDC.SelectObject(wxNullBitmap); + } } -void wxDC::DrawEllipse(long x, long y, long width, long height) +void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { -// BUGBUG - is this necessary? - if (m_pen.Ok() && m_autoSetting) - SetPen(m_pen) ; + if (m_textForegroundColour.Ok()) + SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); -/* - int x1 = (int)x; - int y1 = (int)y; - - if (m_canvas) - { - m_canvas->CalcScrolledPosition((int)x, (int)y, &x1, &y1); - m_canvas->CalcScrolledPosition((int)(x+width), (int)(y+height), &x2, &y2); - } -*/ + DWORD old_background = 0; + if (m_textBackgroundColour.Ok()) + { + old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); + } + + if (m_backgroundMode == wxTRANSPARENT) + SetBkMode(GetHdc(), TRANSPARENT); + else + SetBkMode(GetHdc(), OPAQUE); - long x2 = (x+width); - long y2 = (y+height); + (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), WXSTRINGCAST text, wxStrlen(WXSTRINGCAST text)); - BeginDrawing(); + if (m_textBackgroundColour.Ok()) + (void)SetBkColor(GetHdc(), old_background); - (void)Ellipse((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2)); + // background colour is used only for DrawText, otherwise + // always TRANSPARENT, RR + SetBkMode(GetHdc(), TRANSPARENT); - EndDrawing(); + CalcBoundingBox(x, y); - CalcBoundingBox(x, y); - CalcBoundingBox(x2, y2); + wxCoord w, h; + GetTextExtent(text, &w, &h); + CalcBoundingBox((x + w), (y + h)); } -// 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); - int rx2 = rx1; - int ry2 = ry1; - rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad)); - ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad)); - rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad)); - ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad)); - - // 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)); - if (m_signY > 0) - { - (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1, - rx1, ry1, rx2, ry2); - } - else - { - (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2), - rx1, ry1-1, rx2, ry2-1); - } - ::SelectObject((HDC) m_hDC, orig_pen); - (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) +// --------------------------------------------------------------------------- +// set GDI objects +// --------------------------------------------------------------------------- + +void wxDC::SetPalette(const wxPalette& palette) { -/* - int x1 = (int)x; - int y1 = (int)y; + // Set the old object temporarily, in case the assignment deletes an object + // that's not yet selected out. + if (m_oldPalette) + { + ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, TRUE); + m_oldPalette = 0; + } - if (m_canvas) - m_canvas->CalcScrolledPosition(int)x, (int)y, &x1, &y1); -*/ + m_palette = palette; - BeginDrawing(); + if (!m_palette.Ok()) + { + // Setting a NULL colourmap is a way of restoring + // the original colourmap + if (m_oldPalette) + { + ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, TRUE); + m_oldPalette = 0; + } + + return; + } - ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON()); - CalcBoundingBox(x, y); - CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight()); + if (m_palette.Ok() && m_palette.GetHPALETTE()) + { + HPALETTE oldPal = ::SelectPalette(GetHdc(), (HPALETTE) m_palette.GetHPALETTE(), TRUE); + if (!m_oldPalette) + m_oldPalette = (WXHPALETTE) oldPal; - EndDrawing(); + ::RealizePalette(GetHdc()); + } } void wxDC::SetFont(const wxFont& the_font) { - // Release the current font from servitude (decrements the usage count) -// if (m_font.Ok()) -// m_font.ReleaseResource(); + // Set the old object temporarily, in case the assignment deletes an object + // that's not yet selected out. + if (m_oldFont) + { + ::SelectObject(GetHdc(), (HFONT) m_oldFont); + m_oldFont = 0; + } - BeginDrawing(); + m_font = the_font; - m_font = the_font; + if (!the_font.Ok()) + { + if (m_oldFont) + ::SelectObject(GetHdc(), (HFONT) m_oldFont); + m_oldFont = 0; + } - if (!the_font.Ok()) - { - if (m_oldFont) - ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont); - m_oldFont = 0 ; - } - - if (m_font.Ok() && m_font.GetResourceHandle()) - { -#if DEBUG > 1 - wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle()); -#endif - HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); - if (!m_oldFont) - m_oldFont = (WXHFONT) f; - } - EndDrawing(); + if (m_font.Ok() && m_font.GetResourceHandle()) + { + HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle()); + if (f == (HFONT) NULL) + { + wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont.")); + } + if (!m_oldFont) + m_oldFont = (WXHFONT) f; + } } 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(GetHdc(), (HPEN) m_oldPen); + m_oldPen = 0; + } - m_pen = pen; + m_pen = pen; - if (!m_pen.Ok()) - { - if (m_oldPen) - ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen); - m_oldPen = 0 ; - } - - if (m_pen.Ok()) - { -// m_pen.UseResource(); -// m_pen.RealizeResource(); - if (m_pen.GetResourceHandle()) + if (!m_pen.Ok()) { - HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ; - if (!m_oldPen) - m_oldPen = (WXHPEN) p; + if (m_oldPen) + ::SelectObject(GetHdc(), (HPEN) m_oldPen); + m_oldPen = 0; } - } - EndDrawing(); + if (m_pen.Ok()) + { + if (m_pen.GetResourceHandle()) + { + HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle()); + if (!m_oldPen) + m_oldPen = (WXHPEN) p; + } + } } void wxDC::SetBrush(const wxBrush& brush) { - BeginDrawing(); - -// if (m_brush.Ok()) -// m_brush.ReleaseResource(); - - m_brush = brush; - - if (!m_brush.Ok()) - { + // 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 ; - } - - 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()) ; - if (!m_oldBrush) - m_oldBrush = (WXHBRUSH) b; + ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush); + m_oldBrush = 0; } - } - EndDrawing(); -} - -void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) -{ -/* - int xx1 = (int)x; - int yy1 = (int)y; - - if (m_canvas) - m_canvas->CalcScrolledPosition((int)x, (int)y, &xx1, &yy1); -*/ - - BeginDrawing(); - - if (m_font.Ok() && m_font.GetResourceHandle()) - { -#if DEBUG > 1 - wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle()); -#endif - HFONT f = ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); - if (!m_oldFont) - m_oldFont = (WXHFONT) f; - } - - if (m_textForegroundColour.Ok()) - SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ; - - DWORD old_background; - if (m_textBackgroundColour.Ok()) - { - old_background = SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ; - } - - if (m_backgroundMode == wxTRANSPARENT) - SetBkMode((HDC) m_hDC, TRANSPARENT); - else - SetBkMode((HDC) m_hDC, OPAQUE); - (void)TextOut((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text)); + m_brush = brush; - if (m_textBackgroundColour.Ok()) - (void)SetBkColor((HDC) m_hDC, old_background); - - CalcBoundingBox(x, y); - - long w, h; - GetTextExtent(text, &w, &h); - CalcBoundingBox((x + w), (y + h)); + if (!m_brush.Ok()) + { + if (m_oldBrush) + ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush); + m_oldBrush = 0; + } - EndDrawing(); + if (m_brush.Ok()) + { + if (m_brush.GetResourceHandle()) + { + HBRUSH b = 0; + b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle()); + if (!m_oldBrush) + m_oldBrush = (WXHBRUSH) b; + } + } } void wxDC::SetBackground(const wxBrush& brush) { -// if (m_backgroundBrush.Ok()) -// m_backgroundBrush.ReleaseResource(); + m_backgroundBrush = brush; - m_backgroundBrush = brush; + if (!m_backgroundBrush.Ok()) + return; - if (!m_backgroundBrush.Ok()) - return; - -// m_backgroundBrush.UseResource(); -// m_backgroundBrush.RealizeResource() ; - - if (m_canvas) - { - bool customColours = TRUE; - // If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to - // change background colours from the control-panel specified colours. - if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS)) - customColours = FALSE; - - if (customColours) + if (m_canvas) { -// HBRUSH br = (m_backgroundBrush.GetStyle()==wxTRANSPARENT) ? -// GetStockObject(NULL_BRUSH) : (HBRUSH) m_backgroundBrush.GetResourceHandle(); - if (m_backgroundBrush.GetStyle()==wxTRANSPARENT) - { - m_canvas->m_backgroundTransparent = TRUE; - } - else - { - m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour()); - m_canvas->m_backgroundTransparent = FALSE; - } + bool customColours = TRUE; + // If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to + // change background colours from the control-panel specified colours. + if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS)) + customColours = FALSE; + + if (customColours) + { + if (m_backgroundBrush.GetStyle()==wxTRANSPARENT) + { + m_canvas->SetTransparent(TRUE); + } + else + { + // New behaviour, 10/2/99: setting the background brush of a DC + // doesn't affect the window background colour. However, + // I'm leaving in the transparency setting because it's needed by + // various controls (e.g. wxStaticText) to determine whether to draw + // transparently or not. TODO: maybe this should be a new function + // wxWindow::SetTransparency(). Should that apply to the child itself, or the + // parent? + // m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour()); + m_canvas->SetTransparent(FALSE); + } + } + } + COLORREF new_color = m_backgroundBrush.GetColour().GetPixel(); + { + (void)SetBkColor(GetHdc(), new_color); } - } - 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(); + m_backgroundMode = mode; - if (m_backgroundMode == wxTRANSPARENT) - ::SetBkMode((HDC) m_hDC, TRANSPARENT); - else - ::SetBkMode((HDC) m_hDC, OPAQUE); + // SetBackgroundColour now only refers to text background + // and m_backgroundMode is used there - EndDrawing(); +/* + if (m_backgroundMode == wxTRANSPARENT) + ::SetBkMode(GetHdc(), TRANSPARENT); + else + ::SetBkMode(GetHdc(), OPAQUE); +*/ } void wxDC::SetLogicalFunction(int function) { - m_logicalFunction = function; - - BeginDrawing(); + m_logicalFunction = function; - SetRop((WXHDC) m_hDC); - - EndDrawing(); + SetRop((WXHDC) m_hDC); } void wxDC::SetRop(WXHDC dc) { - if (!dc || m_logicalFunction < 0) - return; + if (!dc || m_logicalFunction < 0) + return; - int c_rop; - // These may be wrong - switch (m_logicalFunction) - { -// case wxXOR: c_rop = R2_XORPEN; break; + int c_rop; + // These may be wrong + switch (m_logicalFunction) + { + // case wxXOR: c_rop = R2_XORPEN; break; case wxXOR: c_rop = R2_NOTXORPEN; break; case wxINVERT: c_rop = R2_NOT; break; case wxOR_REVERSE: c_rop = R2_MERGEPENNOT; break; @@ -1123,581 +874,670 @@ void wxDC::SetRop(WXHDC dc) case wxNAND: case wxCOPY: default: - c_rop = R2_COPYPEN; break; - } - SetROP2((HDC) dc, c_rop); + c_rop = R2_COPYPEN; break; + } + SetROP2((HDC) dc, c_rop); } bool wxDC::StartDoc(const wxString& message) { - if (!this->IsKindOf(CLASSINFO(wxPrinterDC))) + // We might be previewing, so return TRUE to let it continue. return TRUE; - - bool flag = FALSE; - - DOCINFO docinfo; - docinfo.cbSize = sizeof(DOCINFO); - docinfo.lpszDocName = (const char *)message; - docinfo.lpszOutput = (const char *)m_filename; -#if defined(__WIN95__) - docinfo.lpszDatatype = NULL; - docinfo.fwType = 0; -#endif - - if (m_hDC) flag = (SP_ERROR != -#ifndef __WIN32__ - ::StartDoc((HDC) m_hDC, &docinfo)); -#else -#ifdef UNICODE - ::StartDocW((HDC) m_hDC, &docinfo)); -#else - ::StartDocA((HDC) m_hDC, &docinfo)); -#endif -#endif - - else flag = FALSE; - - return flag; } -void wxDC::EndDoc(void) +void wxDC::EndDoc() { - if (!this->IsKindOf(CLASSINFO(wxPrinterDC))) - return; - if (m_hDC) ::EndDoc((HDC) m_hDC); } -void wxDC::StartPage(void) +void wxDC::StartPage() { - if (!this->IsKindOf(CLASSINFO(wxPrinterDC))) - return; - if (m_hDC) - ::StartPage((HDC) m_hDC); } -void wxDC::EndPage(void) +void wxDC::EndPage() { - if (!this->IsKindOf(CLASSINFO(wxPrinterDC))) - return; - if (m_hDC) - ::EndPage((HDC) m_hDC); } -long wxDC::GetCharHeight(void) const +// --------------------------------------------------------------------------- +// text metrics +// --------------------------------------------------------------------------- + +wxCoord wxDC::GetCharHeight() const { - TEXTMETRIC lpTextMetric; + TEXTMETRIC lpTextMetric; - GetTextMetrics((HDC) m_hDC, &lpTextMetric); + GetTextMetrics(GetHdc(), &lpTextMetric); - return YDEV2LOGREL(lpTextMetric.tmHeight); + return YDEV2LOGREL(lpTextMetric.tmHeight); } -long wxDC::GetCharWidth(void) const +wxCoord wxDC::GetCharWidth() const { - TEXTMETRIC lpTextMetric; + TEXTMETRIC lpTextMetric; - GetTextMetrics((HDC) m_hDC, &lpTextMetric); + GetTextMetrics(GetHdc(), &lpTextMetric); - return XDEV2LOGREL(lpTextMetric.tmAveCharWidth); + return XDEV2LOGREL(lpTextMetric.tmAveCharWidth); } -void wxDC::GetTextExtent(const wxString& string, long *x, long *y, - long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const +void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, + wxCoord *descent, wxCoord *externalLeading, + wxFont *theFont) const { - wxFont *fontToUse = (wxFont*) theFont; - if (!fontToUse) - fontToUse = (wxFont*) &m_font; + wxFont *fontToUse = (wxFont*) theFont; + if (!fontToUse) + fontToUse = (wxFont*) &m_font; - SIZE sizeRect; - TEXTMETRIC tm; + SIZE sizeRect; + TEXTMETRIC tm; - GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect); - GetTextMetrics((HDC) m_hDC, &tm); + GetTextExtentPoint(GetHdc(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect); + GetTextMetrics(GetHdc(), &tm); - *x = XDEV2LOGREL(sizeRect.cx); - *y = YDEV2LOGREL(sizeRect.cy); - if (descent) *descent = tm.tmDescent; - if (externalLeading) *externalLeading = tm.tmExternalLeading; + if (x) *x = XDEV2LOGREL(sizeRect.cx); + if (y) *y = YDEV2LOGREL(sizeRect.cy); + if (descent) *descent = tm.tmDescent; + if (externalLeading) *externalLeading = tm.tmExternalLeading; } void wxDC::SetMapMode(int mode) { - m_mappingMode = mode; - - int pixel_width = 0; - int pixel_height = 0; - 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); - mm_height = GetDeviceCaps((HDC) m_hDC, VERTSIZE); + m_mappingMode = mode; - if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0)) - { -// if (!m_hDC && m_canvas) -// m_canvas->ReleaseHDC() ; - return; - } + int pixel_width = 0; + int pixel_height = 0; + int mm_width = 0; + int mm_height = 0; - double mm2pixelsX = pixel_width/mm_width; - double mm2pixelsY = pixel_height/mm_height; + pixel_width = GetDeviceCaps(GetHdc(), HORZRES); + pixel_height = GetDeviceCaps(GetHdc(), VERTRES); + mm_width = GetDeviceCaps(GetHdc(), HORZSIZE); + mm_height = GetDeviceCaps(GetHdc(), VERTSIZE); - switch (mode) - { - case MM_TWIPS: + if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0)) { - m_logicalScaleX = (twips2mm * mm2pixelsX); - m_logicalScaleY = (twips2mm * mm2pixelsY); - break; + return; } - case MM_POINTS: - { - m_logicalScaleX = (pt2mm * mm2pixelsX); - m_logicalScaleY = (pt2mm * mm2pixelsY); - break; - } - case MM_METRIC: - { - m_logicalScaleX = mm2pixelsX; - m_logicalScaleY = mm2pixelsY; - break; - } - case MM_LOMETRIC: + + double mm2pixelsX = pixel_width/mm_width; + double mm2pixelsY = pixel_height/mm_height; + + switch (mode) { - m_logicalScaleX = (mm2pixelsX/10.0); - m_logicalScaleY = (mm2pixelsY/10.0); - break; - } + case wxMM_TWIPS: + { + m_logicalScaleX = (twips2mm * mm2pixelsX); + m_logicalScaleY = (twips2mm * mm2pixelsY); + break; + } + case wxMM_POINTS: + { + m_logicalScaleX = (pt2mm * mm2pixelsX); + m_logicalScaleY = (pt2mm * mm2pixelsY); + break; + } + case wxMM_METRIC: + { + m_logicalScaleX = mm2pixelsX; + m_logicalScaleY = mm2pixelsY; + break; + } + case wxMM_LOMETRIC: + { + m_logicalScaleX = (mm2pixelsX/10.0); + m_logicalScaleY = (mm2pixelsY/10.0); + break; + } default: - case MM_TEXT: - { - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - break; + case wxMM_TEXT: + { + m_logicalScaleX = 1.0; + m_logicalScaleY = 1.0; + break; + } } - } - - if (::GetMapMode((HDC) m_hDC) != MM_ANISOTROPIC) - ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC); - SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL); - m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT); - m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT); - ::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); + if (::GetMapMode(GetHdc()) != MM_ANISOTROPIC) + ::SetMapMode(GetHdc(), MM_ANISOTROPIC); - EndDrawing(); + SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL); + m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT); + m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT); + ::SetWindowExtEx(GetHdc(), m_windowExtX, m_windowExtY, NULL); + ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); + ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); } void wxDC::SetUserScale(double x, double y) { - m_userScaleX = x; - m_userScaleY = y; + m_userScaleX = x; + m_userScaleY = y; - SetMapMode(m_mappingMode); + SetMapMode(m_mappingMode); } void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp) { - m_signX = xLeftRight ? 1 : -1; - m_signY = yBottomUp ? -1 : 1; + m_signX = xLeftRight ? 1 : -1; + m_signY = yBottomUp ? -1 : 1; - SetMapMode(m_mappingMode); + SetMapMode(m_mappingMode); } void wxDC::SetSystemScale(double x, double y) { - m_systemScaleX = x; - m_systemScaleY = y; + m_scaleX = x; + m_scaleY = y; - SetMapMode(m_mappingMode); + SetMapMode(m_mappingMode); } -void wxDC::SetLogicalOrigin(long x, long y) +void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y) { - m_logicalOriginX = x; - m_logicalOriginY = y; - - BeginDrawing(); - - ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); + m_logicalOriginX = x; + m_logicalOriginY = y; - EndDrawing(); + ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL); } -void wxDC::SetDeviceOrigin(long x, long y) +void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y) { - m_deviceOriginX = x; - m_deviceOriginY = y; + m_deviceOriginX = x; + m_deviceOriginY = y; - BeginDrawing(); + ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); +} - ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL); +// --------------------------------------------------------------------------- +// coordinates transformations +// --------------------------------------------------------------------------- - EndDrawing(); +wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const +{ + return (wxCoord) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX); } -long wxDC::DeviceToLogicalX(long x) const +wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const { - return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) - m_logicalOriginX) ; + return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX)); } -long wxDC::DeviceToLogicalXRel(long x) const +wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const { - return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX)) ; + return (wxCoord) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY); } -long wxDC::DeviceToLogicalY(long y) const +wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const { - return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) - m_logicalOriginY) ; + return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY)); } -long wxDC::DeviceToLogicalYRel(long y) const +wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const { - return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY)) ; + return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX); } -long wxDC::LogicalToDeviceX(long x) const +wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const { - return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX + m_deviceOriginX) ; + return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX); } -long wxDC::LogicalToDeviceXRel(long x) const +wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const { - return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) ; + return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY); } -long wxDC::LogicalToDeviceY(long y) const +wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const { - return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY + m_deviceOriginY); + return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY); } -long wxDC::LogicalToDeviceYRel(long y) const +// --------------------------------------------------------------------------- +// bit blit +// --------------------------------------------------------------------------- +bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, + wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask) { - return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) ; -} + wxCoord xdest1 = xdest; + wxCoord ydest1 = ydest; + wxCoord xsrc1 = xsrc; + wxCoord ysrc1 = ysrc; + + // Chris Breeze 18/5/98: use text foreground/background colours + // when blitting from 1-bit bitmaps + COLORREF old_textground = ::GetTextColor(GetHdc()); + COLORREF old_background = ::GetBkColor(GetHdc()); + if (m_textForegroundColour.Ok()) + { + ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() ); + } + if (m_textBackgroundColour.Ok()) + { + ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); + } -// This group of functions may not do any conversion -// if m_scaleGDI is TRUE, since the HDC does the -// conversion automatically. + DWORD dwRop = rop == wxCOPY ? SRCCOPY : + rop == wxCLEAR ? WHITENESS : + rop == wxSET ? BLACKNESS : + rop == wxINVERT ? DSTINVERT : + rop == wxAND ? MERGECOPY : + rop == wxOR ? MERGEPAINT : + rop == wxSRC_INVERT ? NOTSRCCOPY : + rop == wxXOR ? SRCINVERT : + rop == wxOR_REVERSE ? MERGEPAINT : + rop == wxAND_REVERSE ? SRCERASE : + rop == wxSRC_OR ? SRCPAINT : + rop == wxSRC_AND ? SRCAND : + SRCCOPY; + + bool success = TRUE; + if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask()) + { -long wxDC::ImplDeviceToLogicalX(long x) const -{ -// return (m_scaleGDI ? x : DeviceToLogicalX(x)); - return x; +#if 0 // __WIN32__ + // Not implemented under Win95 (or maybe a specific device?) + if (MaskBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, + (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(), + 0, 0, 0xAACC0020)) + { + // Success + } + else +#endif + { + // Old code +#if 0 + HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC); + ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); + success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0); + success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, + (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0); + ::SelectObject(dc_mask, 0); + ::DeleteDC(dc_mask); +#endif + // 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(GetHdc(), &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(GetHdc()); + HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), 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, + GetHdc(), 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(GetHdc(), RGB(255, 255, 255)); + COLORREF prevCol = ::SetTextColor(GetHdc(), 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(GetHdc(), RGB(0, 0, 0)); + ::SetTextColor(GetHdc(), RGB(255, 255, 255)); + ::BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, + dc_mask, xsrc1, ysrc1, SRCAND); + ::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values + ::SetTextColor(GetHdc(), prevCol); + + // OR buffer to dest + success = (::BitBlt(GetHdc(), 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(GetHdc(), &rect, brush); + ::DeleteObject(brush); + } + } + } + else + { + success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC, + xsrc1, ysrc1, dwRop) != 0); + } + } + ::SetTextColor(GetHdc(), old_textground); + ::SetBkColor(GetHdc(), old_background); + + return success; } -long wxDC::ImplDeviceToLogicalY(long y) const +void wxDC::DoGetSize(int *w, int *h) const { -// return (m_scaleGDI ? y : DeviceToLogicalY(y)); - return y; + if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES); + if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES); } -long wxDC::ImplDeviceToLogicalXRel(long x) const +void wxDC::DoGetSizeMM(int *w, int *h) const { -// return (m_scaleGDI ? x : DeviceToLogicalXRel(x)); - return x; + if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZSIZE); + if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTSIZE); } -long wxDC::ImplDeviceToLogicalYRel(long y) const +wxSize wxDC::GetPPI() const { -// return (m_scaleGDI ? y : DeviceToLogicalYRel(y)); - return y; + int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX); + int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY); + + return wxSize(x, y); } -long wxDC::ImplLogicalToDeviceX(long x) const +// For use by wxWindows only, unless custom units are required. +void wxDC::SetLogicalScale(double x, double y) { -// return (m_scaleGDI ? (floor(double(x))) : LogicalToDeviceX(x)); - return x; + m_logicalScaleX = x; + m_logicalScaleY = y; } -long wxDC::ImplLogicalToDeviceY(long y) const +#if WXWIN_COMPATIBILITY +void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y, + float *descent, float *externalLeading, + wxFont *theFont, bool use16bit) const { -// return (m_scaleGDI ? (floor(double(y))) : LogicalToDeviceY(y)); - return y; + wxCoord x1, y1, descent1, externalLeading1; + GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit); + *x = x1; *y = y1; + if (descent) + *descent = descent1; + if (externalLeading) + *externalLeading = externalLeading1; } +#endif + +// --------------------------------------------------------------------------- +// spline drawing code +// --------------------------------------------------------------------------- + +#if wxUSE_SPLINES -long wxDC::ImplLogicalToDeviceXRel(long x) const +class wxSpline: public wxObject { -// return (m_scaleGDI ? (floor(double(x))) : LogicalToDeviceXRel(x)); - return x; -} +public: + int type; + wxList *points; + + wxSpline(wxList *list); + void DeletePoints(); + + // Doesn't delete points + ~wxSpline(); +}; -long wxDC::ImplLogicalToDeviceYRel(long y) const +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(); +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::DoDrawSpline(wxList *list) { -// return (m_scaleGDI ? (floor(double(y))) : LogicalToDeviceYRel(y)); - return y; + wxSpline spline(list); + + wx_draw_open_spline(this, &spline); } -bool wxDC::Blit(long xdest, long ydest, long width, long height, - wxDC *source, long xsrc, long ysrc, int rop, bool useMask) +wxList wx_spline_point_list; + +void wx_draw_open_spline(wxDC *dc, wxSpline *spline) { - BeginDrawing(); - source->BeginDrawing(); + wxPoint *p; + double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; + double x1, y1, x2, y2; - long xdest1 = xdest; - long ydest1 = ydest; - long xsrc1 = xsrc; - long ysrc1 = ysrc; + wxNode *node = spline->points->First(); + p = (wxPoint *)node->Data(); - // Chris Breeze 18/5/98: use text foreground/background colours - // when blitting from 1-bit bitmaps - COLORREF old_textground = ::GetTextColor((HDC)m_hDC); - COLORREF old_background = ::GetBkColor((HDC)m_hDC); - if (m_textForegroundColour.Ok()) - { - ::SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ; - } - if (m_textBackgroundColour.Ok()) - { - ::SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ; - } + x1 = p->x; + y1 = p->y; - DWORD dwRop = rop == wxCOPY ? SRCCOPY : - rop == wxCLEAR ? WHITENESS : - rop == wxSET ? BLACKNESS : - rop == wxINVERT ? DSTINVERT : - rop == wxAND ? MERGECOPY : - rop == wxOR ? MERGEPAINT : - rop == wxSRC_INVERT ? NOTSRCCOPY : - rop == wxXOR ? SRCINVERT : - rop == wxOR_REVERSE ? MERGEPAINT : - rop == wxAND_REVERSE ? SRCERASE : - rop == wxSRC_OR ? SRCPAINT : - rop == wxSRC_AND ? SRCAND : - SRCCOPY; + node = node->Next(); + p = (wxPoint *)node->Data(); - bool success; - if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask()) - { + 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); -#if 0 // __WIN32__ - // Not implemented under Win95 (or maybe a specific device?) - if (MaskBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(), - 0, 0, 0xAACC0020)) - { - // Success - } - else -#endif + wx_spline_add_point(x1, y1); + + while ((node = node->Next()) != NULL) { - // Old code -#if 0 - HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC); - ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap()); - success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0); - success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, - (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0); - ::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); + 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; } - } - 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; -} + wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1)); + wx_spline_add_point(x2, y2); -void wxDC::GetSize(int* width, int* height) const -{ - long w=::GetDeviceCaps((HDC) m_hDC,HORZRES); - long h=::GetDeviceCaps((HDC) m_hDC,VERTRES); - *width = w; - *height = h; -} + wx_spline_draw_point_array(dc); -void wxDC::GetSizeMM(long *width, long *height) const -{ - long w=::GetDeviceCaps((HDC) m_hDC,HORZSIZE); - long h=::GetDeviceCaps((HDC) m_hDC,VERTSIZE); - *width = w; - *height = h; } -/* -#if USE_SPLINES -# if USE_XFIG_SPLINE_CODE -# include "../common/xfspline.inc" -# else -# include "../common/wxspline.inc" -# endif -#endif // USE_SPLINES -*/ +/********************* 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 -#if USE_SPLINES -#include "xfspline.inc" -#endif // USE_SPLINES + "On Chaikin's Algorithm" by R. F. Riesenfeld, + Computer Graphics and Image Processing, 4, Academic Press, + 1975, 304-310. -void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle) +***********************************************************************/ + +#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) { - int n = list->Number(); - wxPoint *points = new wxPoint[n]; + register double xmid, ymid; + double x1, y1, x2, y2, x3, y3, x4, y4; - int i = 0; - for(wxNode *node = list->First(); node; node = node->Next()) { - wxPoint *point = (wxPoint *)node->Data(); - points[i].x = point->x; - points[i++].y = point->y; - } - DrawPolygon(n, points, xoffset, yoffset,fillStyle); - delete[] points; + 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); + } + } } -void wxDC::DrawLines(wxList *list, long xoffset, long yoffset) -{ - int n = list->Number(); - wxPoint *points = new wxPoint[n]; - int i = 0; - for(wxNode *node = list->First(); node; node = node->Next()) { - wxPoint *point = (wxPoint *)node->Data(); - points[i].x = point->x; - points[i++].y = point->y; - } - DrawLines(n, points, xoffset, yoffset); - delete []points; +/* 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 wxDC::SetTextForeground(const wxColour& colour) +void wx_clear_stack() { - m_textForegroundColour = colour; + wx_stack_top = wx_spline_stack; + wx_stack_count = 0; } -void wxDC::SetTextBackground(const wxColour& colour) +void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) { - m_textBackgroundColour = colour; + 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++; } -#if USE_SPLINES -// Make a 3-point spline -void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3) +int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, + double *x3, double *y3, double *x4, double *y4) { - 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); + 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); +} - wx_draw_open_spline(this, &spline); - spline.DeletePoints(); - */ +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; } -#endif -// For use by wxWindows only, unless custom units are required. -void wxDC::SetLogicalScale(double x, double y) +static void wx_spline_draw_point_array(wxDC *dc) { - m_logicalScaleX = x; - m_logicalScaleY = y; + dc->DrawLines(&wx_spline_point_list, 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(); + } } -void wxDC::CalcBoundingBox(long x, long y) +wxSpline::wxSpline(wxList *list) { - if (x < m_minX) m_minX = x; - if (y < m_minY) m_minY = y; - if (x > m_maxX) m_maxX = x; - if (y > m_maxY) m_maxY = y; + points = list; } -void wxDC::GetClippingBox(long *x,long *y,long *w,long *h) const +wxSpline::~wxSpline() { - if (m_clipping) - { - *x = m_clipX1 ; - *y = m_clipY1 ; - *w = (m_clipX2 - m_clipX1) ; - *h = (m_clipY2 - m_clipY1) ; - } - else - *x = *y = *w = *h = 0 ; } -#if WXWIN_COMPATIBILITY -void wxDC::GetTextExtent(const wxString& string, float *x, float *y, - float *descent, float *externalLeading, - wxFont *theFont, bool use16bit) const +void wxSpline::DeletePoints() { - long x1, y1, descent1, externalLeading1; - GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit); - *x = x1; *y = y1; - if (descent) - *descent = descent1; - if (externalLeading) - *externalLeading = externalLeading1; + for(wxNode *node = points->First(); node; node = points->First()) + { + wxPoint *point = (wxPoint *)node->Data(); + delete point; + delete node; + } + delete points; } -#endif + + +#endif // wxUSE_SPLINES