// 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/bitmap.h"
-#include "wx/dcmemory.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 <string.h>
#include <math.h>
#if wxUSE_COMMON_DIALOGS
-#include <commdlg.h>
+ #include <commdlg.h>
#endif
#ifndef __WIN32__
-#include <print.h>
#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;
+
+static const int MM_POINTS = 9;
+static const int MM_METRIC = 10;
+
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+// Logical to device
+// Absolute
+#define XLOG2DEV(x) (x)
+#define YLOG2DEV(y) (y)
+
+// Relative
+#define XLOG2DEVREL(x) (x)
+#define YLOG2DEVREL(y) (y)
+
+// Device to logical
+// Absolute
+#define XDEV2LOG(x) (x)
+
+#define YDEV2LOG(y) (y)
+
+// Relative
+#define XDEV2LOGREL(x) (x)
+#define YDEV2LOGREL(y) (y)
+
+/*
+ * Have the same macros as for XView but not for every operation:
+ * just for calculating window/viewport extent (a better way of scaling).
+ */
+
+// Logical to device
+// Absolute
+#define MS_XLOG2DEV(x) LogicalToDevice(x)
+
+#define MS_YLOG2DEV(y) LogicalToDevice(y)
+
+// Relative
+#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x)
+#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y)
+
+// Device to logical
+// Absolute
+#define MS_XDEV2LOG(x) DeviceToLogicalX(x)
+
+#define MS_YDEV2LOG(y) DeviceToLogicalY(y)
-// Declarations local to this file
+// Relative
+#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
+#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
#define YSCALE(y) (yorigin - (y))
-// #define wx_round(a) (int)((a)+.5)
+#define wx_round(a) (int)((a)+.5)
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxDC
+// ---------------------------------------------------------------------------
// Default constructor
-wxDC::wxDC(void)
-{
- m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
- m_clipping = FALSE;
-
- m_filename = "";
- m_canvas = 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_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 = wxMM_TEXT;
- 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_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);
+wxDC::wxDC()
+{
+ m_canvas = NULL;
+
+ m_oldBitmap = 0;
+ m_oldPen = 0;
+ m_oldBrush = 0;
+ m_oldFont = 0;
+ m_oldPalette = 0;
+
+ 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());
+ }
}
- }
}
// DC.
void wxDC::SelectOldObjects(WXHDC dc)
{
- if (dc)
- {
- 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)
+ if (dc)
{
- ::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);
+ 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_oldPalette = 0 ;
- }
- 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(long cx, long cy, long cw, long 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);
- DoClipping((WXHDC) m_hDC);
+ DoClipping((WXHDC) m_hDC);
}
-void wxDC::SetClippingRegion(const wxRegion& region)
+void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
{
- if (!region.GetHRGN())
- return;
+ wxCHECK_RET( region.GetHRGN(), _T("invalid clipping region") );
- wxRect box = region.GetBox();
+ 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;
+ 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((HDC) m_hDC, (HRGN) region.GetHRGN());
+ SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
#else
- ExtSelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN(), RGN_AND);
+ 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 (m_clipping && dc)
+ {
+ IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
+ XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
+ }
+}
+
+void wxDC::DestroyClippingRegion()
+{
+ 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;
}
-void wxDC::DestroyClippingRegion(void)
+// ---------------------------------------------------------------------------
+// query capabilities
+// ---------------------------------------------------------------------------
+
+bool wxDC::CanDrawBitmap() const
{
- 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((HDC) m_hDC, rgn);
- DeleteObject(rgn);
- }
- m_clipping = FALSE;
+ return TRUE;
}
-bool wxDC::CanDrawBitmap(void) const
+bool wxDC::CanGetTextExtent() const
{
- return TRUE;
+ // What sort of display is it?
+ int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
+
+ return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);
}
-bool wxDC::CanGetTextExtent(void) const
+int wxDC::GetDepth() const
+{
+ return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
+}
+
+// ---------------------------------------------------------------------------
+// drawing
+// ---------------------------------------------------------------------------
+
+void wxDC::Clear()
{
- // What sort of display is it?
- int technology = ::GetDeviceCaps((HDC) m_hDC, TECHNOLOGY);
+ RECT rect;
+ if ( m_canvas )
+ {
+ GetClientRect((HWND) m_canvas->GetHWND(), &rect);
+ }
+ else
+ {
+ wxCHECK_RET( m_selectedBitmap.Ok(), _T("this DC can't be cleared") );
+
+ rect.left = 0; rect.top = 0;
+ rect.right = m_selectedBitmap.GetWidth();
+ rect.bottom = m_selectedBitmap.GetHeight();
+ }
- bool ok;
+ (void) ::SetMapMode(GetHdc(), MM_TEXT);
- if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
- ok = FALSE;
- else ok = TRUE;
+ DWORD colour = GetBkColor(GetHdc());
+ HBRUSH brush = CreateSolidBrush(colour);
+ FillRect(GetHdc(), &rect, brush);
+ DeleteObject(brush);
- return ok;
+ ::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::SetPalette(const wxPalette& palette)
+void wxDC::DoFloodFill(long x, long y, const wxColour& col, int style)
{
- // 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;
- }
+ (void)ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+ col.GetPixel(),
+ style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
+ : FLOODFILLBORDER);
- m_palette = palette;
+ CalcBoundingBox(x, y);
+}
- if (!m_palette.Ok())
- {
- // Setting a NULL colourmap is a way of restoring
- // the original colourmap
- if (m_oldPalette)
+bool wxDC::DoGetPixel(long x, long 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
+
+ // 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())
{
- ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
- m_oldPalette = 0;
+ pencolor = m_pen.GetColour().GetPixel();
}
- 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;
+ // return the color of the pixel
+ if(col)
+ col->Set(GetRValue(pixelcolor),GetGValue(pixelcolor),GetBValue(pixelcolor));
- ::RealizePalette((HDC) m_hDC);
- }
+ // check, if color of the pixels is the same as the color
+ // of the current pen
+ return(pixelcolor==pencolor);
}
-void wxDC::Clear(void)
+void wxDC::DoCrossHair(long x, long y)
{
- 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);
+ long x1 = x-VIEWPORT_EXTENT;
+ long y1 = y-VIEWPORT_EXTENT;
+ long x2 = x+VIEWPORT_EXTENT;
+ long y2 = y+VIEWPORT_EXTENT;
+
+ (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL);
+ (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y));
- DWORD colour = GetBkColor((HDC) m_hDC);
- HBRUSH brush = CreateSolidBrush(colour);
- FillRect((HDC) m_hDC, &rect, brush);
- DeleteObject(brush);
+ (void)MoveToEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), NULL);
+ (void)LineTo(GetHdc(), XLOG2DEV(x), YLOG2DEV(y2));
- ::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);
+ CalcBoundingBox(x1, y1);
+ CalcBoundingBox(x2, y2);
}
-void wxDC::FloodFill(long x, long y, const wxColour& col, int style)
+void wxDC::DoDrawLine(long x1, long y1, long x2, long y2)
{
- (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
- col.GetPixel(),
- style==wxFLOOD_SURFACE?
- FLOODFILLSURFACE:FLOODFILLBORDER
- );
+ (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
+ (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
+
+ /* MATTHEW: [6] New normalization */
+#if WX_STANDARD_GRAPHICS
+ (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
+#endif
- CalcBoundingBox(x, y);
+ CalcBoundingBox(x1, y1);
+ CalcBoundingBox(x2, y2);
}
-bool wxDC::GetPixel(long x, long y, wxColour *col) const
+void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
{
- // 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
+ double dx = xc-x1;
+ double dy = yc-y1;
+ double radius = (double)sqrt(dx*dx+dy*dy) ;;
+ if (x1==x2 && x2==y2)
+ {
+ DrawEllipse(xc,yc,(long)(radius*2.0),(long)(radius*2.0));
+ return;
+ }
+
+ 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(GetHdc(), (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)
+ {
+ // 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);
- // 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);
+ CalcBoundingBox((xc-radius), (yc-radius));
+ CalcBoundingBox((xc+radius), (yc+radius));
}
-void wxDC::CrossHair(long x, long y)
+void wxDC::DoDrawPoint(long x, long y)
{
- // We suppose that our screen is 2000x2000 max.
- long x1 = x-2000;
- long y1 = y-2000;
- long x2 = x+2000;
- long y2 = y+2000;
-
- (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL);
- (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y));
+ COLORREF color = 0x00ffffff;
+ if (m_pen.Ok())
+ {
+ color = m_pen.GetColour().GetPixel();
+ }
- (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL);
- (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2));
+ SetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), color);
- CalcBoundingBox(x1, y1);
- CalcBoundingBox(x2, y2);
+ CalcBoundingBox(x, y);
}
-void wxDC::DrawLine(long x1, long y1, long x2, long y2)
+void wxDC::DoDrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle)
{
- (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y1), NULL);
- (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y2));
-
- /* MATTHEW: [6] New normalization */
-#if WX_STANDARD_GRAPHICS
- (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2));
-#endif
+ // 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(x1, y1);
- CalcBoundingBox(x2, y2);
-}
-
-void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long 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,(long)(radius*2.0),(long)(radius*2.0)) ;
- return ;
- }
-
- 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)
- {
- // 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) ;
-
- CalcBoundingBox((xc-radius), (yc-radius));
- CalcBoundingBox((xc+radius), (yc+radius));
-}
-
-void wxDC::DrawPoint(long x, long y)
-{
- COLORREF color = 0x00ffffff;
- if (m_pen.Ok())
- {
- color = m_pen.GetColour().GetPixel() ;
- }
-
- SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color);
-
- CalcBoundingBox(x, y);
-}
-
-void wxDC::DrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle)
-{
- // 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++)
+ 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
{
- cpoints[i].x = (int)(points[i].x + xoffset);
- cpoints[i].y = (int)(points[i].y + yoffset);
+ int i;
+ for (i = 0; i < n; i++)
+ CalcBoundingBox(points[i].x, points[i].y);
- CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+ int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+ (void)Polygon(GetHdc(), (POINT*) points, n);
+ SetPolyFillMode(GetHdc(),prev);
}
- 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, (POINT*) points, n);
- SetPolyFillMode((HDC) m_hDC,prev) ;
- }
-}
-
-void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long 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++)
+}
+
+void wxDC::DoDrawLines(int n, wxPoint points[], long xoffset, long yoffset)
+{
+ // Do things less efficiently if we have offsets
+ if (xoffset != 0 || yoffset != 0)
{
- cpoints[i].x = (int)(points[i].x + xoffset);
- cpoints[i].y = (int)(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(cpoints[i].x, cpoints[i].y);
+ CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+ }
+ (void)Polyline(GetHdc(), cpoints, n);
+ delete[] cpoints;
}
- (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);
+ else
+ {
+ int i;
+ for (i = 0; i < n; i++)
+ CalcBoundingBox(points[i].x, points[i].y);
- (void)Polyline((HDC) m_hDC, (POINT*) points, n);
- }
+ (void)Polyline(GetHdc(), (POINT*) points, n);
+ }
}
-void wxDC::DrawRectangle(long x, long y, long width, long height)
+void wxDC::DoDrawRectangle(long x, long y, long width, long height)
{
- long x2 = x + width;
- long y2 = y + height;
+ long x2 = x + width;
+ long y2 = y + height;
-/* MATTHEW: [6] new normalization */
+ /* MATTHEW: [6] new normalization */
#if WX_STANDARD_GRAPHICS
- bool do_brush, do_pen;
+ bool do_brush, do_pen;
- do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
- do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
+ do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
+ do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
- if (do_brush) {
- HPEN orig_pen = NULL;
+ if (do_brush) {
+ HPEN orig_pen = NULL;
- if (do_pen || !m_pen.Ok())
- orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
+ if (do_pen || !m_pen.Ok())
+ orig_pen = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
- (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
- XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
+ (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+ XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
- if (do_pen || !m_pen.Ok())
- ::SelectObject((HDC) m_hDC , orig_pen);
- }
- if (do_pen) {
- HBRUSH orig_brush = NULL;
+ if (do_pen || !m_pen.Ok())
+ ::SelectObject(GetHdc() , orig_pen);
+ }
+ if (do_pen) {
+ HBRUSH orig_brush = NULL;
- if (do_brush || !m_brush.Ok())
- orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
+ if (do_brush || !m_brush.Ok())
+ orig_brush = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH) ::GetStockObject(NULL_BRUSH));
- (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
- XLOG2DEV(x2), YLOG2DEV(y2));
+ (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+ XLOG2DEV(x2), YLOG2DEV(y2));
- if (do_brush || !m_brush.Ok())
- ::SelectObject((HDC) m_hDC, orig_brush);
- }
+ if (do_brush || !m_brush.Ok())
+ ::SelectObject(GetHdc(), orig_brush);
+ }
#else
- (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+ (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
#endif
- CalcBoundingBox(x, y);
- CalcBoundingBox(x2, y2);
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x2, y2);
}
-void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double radius)
+void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, double radius)
{
- // Now, a negative radius value is interpreted to mean
- // 'the proportion of the smallest X or Y dimension'
+ // 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);
- }
+ if (radius < 0.0)
+ {
+ double smallest = 0.0;
+ if (width < height)
+ smallest = width;
+ else
+ smallest = height;
+ radius = (- radius * smallest);
+ }
- long x2 = (x+width);
- long y2 = (y+height);
+ long x2 = (x+width);
+ long y2 = (y+height);
- (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
- YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius));
+ (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
+ YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));
- CalcBoundingBox(x, y);
- CalcBoundingBox(x2, y2);
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x2, y2);
}
-void wxDC::DrawEllipse(long x, long y, long width, long height)
+void wxDC::DoDrawEllipse(long x, long y, long width, long height)
{
- long x2 = (x+width);
- long y2 = (y+height);
+ long x2 = (x+width);
+ long y2 = (y+height);
- (void)Ellipse((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+ (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
- CalcBoundingBox(x, y);
- CalcBoundingBox(x2, y2);
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x2, y2);
}
// 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)
-{
- long x2 = (x+w);
- long 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((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,
+void wxDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
+{
+ long x2 = (x+w);
+ long 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);
- }
- 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);
- CalcBoundingBox(x, y);
- CalcBoundingBox(x2, y2);
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x2, y2);
}
-void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
+void wxDC::DoDrawIcon(const wxIcon& icon, long x, long y)
{
#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
- ::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
- icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
+ ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
+ icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
#else
- ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
+ ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
#endif
- CalcBoundingBox(x, y);
- CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight());
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight());
}
-void wxDC::DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
+void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
{
if (!bmp.Ok())
return;
// optimize this function to use Windows functions.
if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
{
- HDC cdc = (HDC)m_hDC;
+ HDC cdc = GetHdc();
HDC memdc = ::CreateCompatibleDC( cdc );
HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
::SelectObject( memdc, hbitmap );
::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
- ::SelectObject( memdc, 0 );
::DeleteDC( memdc );
}
else
memDC.SelectObject(bmp);
/* Not sure if we need this. The mask should leave the
- * masked areas as per the original background of this DC.
- */
-/*
+ * 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);
}
}
-void wxDC::SetFont(const wxFont& the_font)
+void wxDC::DoDrawText(const wxString& text, long x, long y)
{
- // 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;
+ if (m_textForegroundColour.Ok())
+ SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
- if (!the_font.Ok())
- {
- if (m_oldFont)
- ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont);
- m_oldFont = 0 ;
- }
-
- if (m_font.Ok() && m_font.GetResourceHandle())
- {
- HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
- if (f == (HFONT) NULL)
+ DWORD old_background = 0;
+ if (m_textBackgroundColour.Ok())
{
- wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
+ old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
}
- if (!m_oldFont)
- m_oldFont = (WXHFONT) f;
- }
+
+ if (m_backgroundMode == wxTRANSPARENT)
+ SetBkMode(GetHdc(), TRANSPARENT);
+ else
+ SetBkMode(GetHdc(), OPAQUE);
+
+ (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), WXSTRINGCAST text, wxStrlen(WXSTRINGCAST text));
+
+ if (m_textBackgroundColour.Ok())
+ (void)SetBkColor(GetHdc(), old_background);
+
+ CalcBoundingBox(x, y);
+
+ long w, h;
+ GetTextExtent(text, &w, &h);
+ CalcBoundingBox((x + w), (y + h));
}
-void wxDC::SetPen(const wxPen& pen)
+// ---------------------------------------------------------------------------
+// set GDI objects
+// ---------------------------------------------------------------------------
+
+void wxDC::SetPalette(const wxPalette& palette)
{
- // 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;
- }
+ // 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;
+ }
- m_pen = pen;
+ m_palette = palette;
- if (!m_pen.Ok())
- {
- if (m_oldPen)
- ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
- m_oldPen = 0 ;
- }
+ 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;
+ }
- if (m_pen.Ok())
- {
- if (m_pen.GetResourceHandle())
+ if (m_palette.Ok() && m_palette.GetHPALETTE())
{
- HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ;
- if (!m_oldPen)
- m_oldPen = (WXHPEN) p;
+ HPALETTE oldPal = ::SelectPalette(GetHdc(), (HPALETTE) m_palette.GetHPALETTE(), TRUE);
+ if (!m_oldPalette)
+ m_oldPalette = (WXHPALETTE) oldPal;
+
+ ::RealizePalette(GetHdc());
}
- }
}
-void wxDC::SetBrush(const wxBrush& brush)
+void wxDC::SetFont(const wxFont& the_font)
{
- // 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;
- }
+ // 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;
+ }
- m_brush = brush;
+ m_font = the_font;
- if (!m_brush.Ok())
- {
- if (m_oldBrush)
- ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
- m_oldBrush = 0 ;
- }
+ if (!the_font.Ok())
+ {
+ if (m_oldFont)
+ ::SelectObject(GetHdc(), (HFONT) m_oldFont);
+ m_oldFont = 0;
+ }
- if (m_brush.Ok())
- {
- if (m_brush.GetResourceHandle())
+ if (m_font.Ok() && m_font.GetResourceHandle())
{
- HBRUSH b = 0;
- b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
- if (!m_oldBrush)
- m_oldBrush = (WXHBRUSH) b;
+ HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
+ if (f == (HFONT) NULL)
+ {
+ wxLogDebug(_T("::SelectObject failed in wxDC::SetFont."));
+ }
+ if (!m_oldFont)
+ m_oldFont = (WXHFONT) f;
}
- }
}
-void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
+void wxDC::SetPen(const wxPen& pen)
{
- // Should be unnecessary: SetFont should have done this already.
-#if 0
- if (m_font.Ok() && m_font.GetResourceHandle())
- {
- HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
- if (!m_oldFont)
- m_oldFont = (WXHFONT) f;
- }
-#endif
+ // 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;
+ }
- if (m_textForegroundColour.Ok())
- SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
+ m_pen = pen;
- DWORD old_background = 0;
- if (m_textBackgroundColour.Ok())
- {
- old_background = SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
- }
+ if (!m_pen.Ok())
+ {
+ if (m_oldPen)
+ ::SelectObject(GetHdc(), (HPEN) m_oldPen);
+ m_oldPen = 0;
+ }
- if (m_backgroundMode == wxTRANSPARENT)
- SetBkMode((HDC) m_hDC, TRANSPARENT);
- else
- SetBkMode((HDC) m_hDC, OPAQUE);
+ 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)TextOut((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
+void wxDC::SetBrush(const wxBrush& brush)
+{
+ // Set the old object temporarily, in case the assignment deletes an object
+ // that's not yet selected out.
+ if (m_oldBrush)
+ {
+ ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
+ m_oldBrush = 0;
+ }
- if (m_textBackgroundColour.Ok())
- (void)SetBkColor((HDC) m_hDC, old_background);
+ m_brush = brush;
- CalcBoundingBox(x, y);
+ if (!m_brush.Ok())
+ {
+ if (m_oldBrush)
+ ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
+ m_oldBrush = 0;
+ }
- long w, h;
- GetTextExtent(text, &w, &h);
- CalcBoundingBox((x + w), (y + h));
+ 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)
{
- m_backgroundBrush = brush;
+ m_backgroundBrush = brush;
- if (!m_backgroundBrush.Ok())
- return;
+ if (!m_backgroundBrush.Ok())
+ return;
- 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)
{
- if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
- {
- m_canvas->m_backgroundTransparent = 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->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);
}
- }
- COLORREF new_color = m_backgroundBrush.GetColour().GetPixel() ;
- {
- (void)SetBkColor((HDC) m_hDC, new_color);
- }
}
void wxDC::SetBackgroundMode(int mode)
{
- m_backgroundMode = mode;
+ m_backgroundMode = mode;
- if (m_backgroundMode == wxTRANSPARENT)
- ::SetBkMode((HDC) m_hDC, TRANSPARENT);
- else
- ::SetBkMode((HDC) m_hDC, OPAQUE);
+ if (m_backgroundMode == wxTRANSPARENT)
+ ::SetBkMode(GetHdc(), TRANSPARENT);
+ else
+ ::SetBkMode(GetHdc(), OPAQUE);
}
void wxDC::SetLogicalFunction(int function)
{
- m_logicalFunction = function;
+ m_logicalFunction = function;
- SetRop((WXHDC) m_hDC);
+ 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;
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;
-
- DOCINFO docinfo;
- docinfo.cbSize = sizeof(DOCINFO);
- docinfo.lpszDocName = (const char *)message;
-
- 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)
- return FALSE;
-
- int ret =
-#ifndef __WIN32__
- ::StartDoc((HDC) m_hDC, &docinfo);
-#else
-#ifdef UNICODE
- ::StartDocW((HDC) m_hDC, &docinfo);
-#else
-#ifdef __TWIN32__
- ::StartDoc((HDC) m_hDC, &docinfo);
-#else
- ::StartDocA((HDC) m_hDC, &docinfo);
-#endif
-#endif
-#endif
-
-#ifndef __WIN16__
- if (ret <= 0)
- {
- DWORD lastError = GetLastError();
- wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError);
- }
-#endif
-
- return (ret > 0);
}
-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
+// ---------------------------------------------------------------------------
+
+long 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
+long 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
+ long *descent, long *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);
- if (x) *x = XDEV2LOGREL(sizeRect.cx);
- if (y) *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;
+ m_mappingMode = mode;
- int pixel_width = 0;
- int pixel_height = 0;
- int mm_width = 0;
- int mm_height = 0;
+ int pixel_width = 0;
+ int pixel_height = 0;
+ int mm_width = 0;
+ int mm_height = 0;
- 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);
+ pixel_width = GetDeviceCaps(GetHdc(), HORZRES);
+ pixel_height = GetDeviceCaps(GetHdc(), VERTRES);
+ mm_width = GetDeviceCaps(GetHdc(), HORZSIZE);
+ mm_height = GetDeviceCaps(GetHdc(), VERTSIZE);
- if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
- {
- return;
- }
+ if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
+ {
+ return;
+ }
- double mm2pixelsX = pixel_width/mm_width;
- double mm2pixelsY = pixel_height/mm_height;
+ double mm2pixelsX = pixel_width/mm_width;
+ double mm2pixelsY = pixel_height/mm_height;
- switch (mode)
- {
- case wxMM_TWIPS:
+ switch (mode)
{
- m_logicalScaleX = (twips2mm * mm2pixelsX);
- m_logicalScaleY = (twips2mm * mm2pixelsY);
- 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;
- }
+ {
+ m_logicalScaleX = (pt2mm * mm2pixelsX);
+ m_logicalScaleY = (pt2mm * mm2pixelsY);
+ break;
+ }
case wxMM_METRIC:
- {
- m_logicalScaleX = mm2pixelsX;
- m_logicalScaleY = mm2pixelsY;
- break;
- }
+ {
+ m_logicalScaleX = mm2pixelsX;
+ m_logicalScaleY = mm2pixelsY;
+ break;
+ }
case wxMM_LOMETRIC:
- {
- m_logicalScaleX = (mm2pixelsX/10.0);
- m_logicalScaleY = (mm2pixelsY/10.0);
- break;
- }
+ {
+ m_logicalScaleX = (mm2pixelsX/10.0);
+ m_logicalScaleY = (mm2pixelsY/10.0);
+ break;
+ }
default:
case wxMM_TEXT:
- {
- m_logicalScaleX = 1.0;
- m_logicalScaleY = 1.0;
- break;
+ {
+ m_logicalScaleX = 1.0;
+ m_logicalScaleY = 1.0;
+ break;
+ }
}
- }
- if (::GetMapMode((HDC) m_hDC) != MM_ANISOTROPIC)
- ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
+ if (::GetMapMode(GetHdc()) != MM_ANISOTROPIC)
+ ::SetMapMode(GetHdc(), 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);
+ 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)
{
- m_logicalOriginX = x;
- m_logicalOriginY = y;
+ m_logicalOriginX = x;
+ m_logicalOriginY = y;
- ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+ ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
}
void wxDC::SetDeviceOrigin(long x, long y)
{
- m_deviceOriginX = x;
- m_deviceOriginY = y;
-
- ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-}
-
-long wxDC::DeviceToLogicalX(long x) const
-{
- return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) - m_logicalOriginX) ;
-}
-
-long wxDC::DeviceToLogicalXRel(long x) const
-{
- return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX)) ;
-}
-
-long wxDC::DeviceToLogicalY(long y) const
-{
- return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) - m_logicalOriginY) ;
-}
-
-long wxDC::DeviceToLogicalYRel(long y) const
-{
- return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY)) ;
-}
+ m_deviceOriginX = x;
+ m_deviceOriginY = y;
-long wxDC::LogicalToDeviceX(long x) const
-{
- return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX + m_deviceOriginX) ;
+ ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
}
-long wxDC::LogicalToDeviceXRel(long x) const
-{
- return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) ;
-}
+// ---------------------------------------------------------------------------
+// coordinates transformations
+// ---------------------------------------------------------------------------
-long wxDC::LogicalToDeviceY(long y) const
+long wxDCBase::DeviceToLogicalX(long x) const
{
- return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY + m_deviceOriginY);
+ return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX);
}
-long wxDC::LogicalToDeviceYRel(long y) const
+long wxDCBase::DeviceToLogicalXRel(long x) const
{
- return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) ;
+ return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));
}
-// This group of functions may not do any conversion
-// if m_scaleGDI is TRUE, since the HDC does the
-// conversion automatically.
-
-long wxDC::ImplDeviceToLogicalX(long x) const
+long wxDCBase::DeviceToLogicalY(long y) const
{
-// return (m_scaleGDI ? x : DeviceToLogicalX(x));
- return x;
+ return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY);
}
-long wxDC::ImplDeviceToLogicalY(long y) const
+long wxDCBase::DeviceToLogicalYRel(long y) const
{
-// return (m_scaleGDI ? y : DeviceToLogicalY(y));
- return y;
+ return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY));
}
-long wxDC::ImplDeviceToLogicalXRel(long x) const
+long wxDCBase::LogicalToDeviceX(long x) const
{
-// return (m_scaleGDI ? x : DeviceToLogicalXRel(x));
- return x;
+ return (long) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);
}
-long wxDC::ImplDeviceToLogicalYRel(long y) const
+long wxDCBase::LogicalToDeviceXRel(long x) const
{
-// return (m_scaleGDI ? y : DeviceToLogicalYRel(y));
- return y;
+ return (long) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);
}
-long wxDC::ImplLogicalToDeviceX(long x) const
+long wxDCBase::LogicalToDeviceY(long y) const
{
-// return (m_scaleGDI ? (floor(double(x))) : LogicalToDeviceX(x));
- return x;
+ return (long) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);
}
-long wxDC::ImplLogicalToDeviceY(long y) const
+long wxDCBase::LogicalToDeviceYRel(long y) const
{
-// return (m_scaleGDI ? (floor(double(y))) : LogicalToDeviceY(y));
- return y;
+ return (long) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);
}
-long wxDC::ImplLogicalToDeviceXRel(long x) const
+// ---------------------------------------------------------------------------
+// bit blit
+// ---------------------------------------------------------------------------
+bool wxDC::DoBlit(long xdest, long ydest, long width, long height,
+ wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
{
-// return (m_scaleGDI ? (floor(double(x))) : LogicalToDeviceXRel(x));
- return x;
-}
+ long xdest1 = xdest;
+ long ydest1 = ydest;
+ long xsrc1 = xsrc;
+ long ysrc1 = ysrc;
-long wxDC::ImplLogicalToDeviceYRel(long y) const
-{
-// return (m_scaleGDI ? (floor(double(y))) : LogicalToDeviceYRel(y));
- return y;
-}
-
-bool wxDC::Blit(long xdest, long ydest, long width, long height,
- wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
-{
- long xdest1 = xdest;
- long ydest1 = ydest;
- long xsrc1 = xsrc;
- long ysrc1 = ysrc;
-
- // 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() ) ;
- }
-
- 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;
+ // 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() );
+ }
- bool success = TRUE;
- if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
- {
+ 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())
+ {
#if 0 // __WIN32__
- // Not implemented under Win95 (or maybe a specific device?)
- if (MaskBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
+ // 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
+ {
+ // Success
+ }
+ else
#endif
- {
- // Old code
+ {
+ // 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);
+ 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
+ // 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
+ // 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());
+ RECT rect;
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);
- }
+ 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((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);
+ success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
+ xsrc1, ysrc1, dwRop) != 0);
}
- }
- }
- 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);
+ ::SetTextColor(GetHdc(), old_textground);
+ ::SetBkColor(GetHdc(), old_background);
- return success;
+ return success;
}
-void wxDC::GetSize(int* width, int* height) const
+void wxDC::DoGetSize(int *w, int *h) const
{
- long w=::GetDeviceCaps((HDC) m_hDC,HORZRES);
- long h=::GetDeviceCaps((HDC) m_hDC,VERTRES);
- *width = w;
- *height = h;
-}
-
-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;
-}
-
-void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle)
-{
- 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;
- }
- DrawPolygon(n, points, xoffset, yoffset,fillStyle);
- delete[] points;
+ if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
+ if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
}
-void wxDC::DrawLines(wxList *list, long xoffset, long yoffset)
+void wxDC::DoGetSizeMM(int *w, int *h) const
{
- 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;
+ if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZSIZE);
+ if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTSIZE);
}
-void wxDC::SetTextForeground(const wxColour& colour)
+wxSize wxDC::GetPPI() const
{
- m_textForegroundColour = colour;
-}
+ int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
+ int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);
-void wxDC::SetTextBackground(const wxColour& colour)
-{
- m_textBackgroundColour = colour;
+ return wxSize(x, y);
}
// For use by wxWindows only, unless custom units are required.
void wxDC::SetLogicalScale(double x, double y)
{
- m_logicalScaleX = x;
- m_logicalScaleY = y;
-}
-
-void wxDC::CalcBoundingBox(long x, long y)
-{
- 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;
-}
-
-void wxDC::GetClippingBox(long *x,long *y,long *w,long *h) const
-{
- 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 ;
+ m_logicalScaleX = x;
+ m_logicalScaleY = y;
}
#if WXWIN_COMPATIBILITY
-void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
- float *descent, float *externalLeading,
- wxFont *theFont, bool use16bit) const
+void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
+ float *descent, float *externalLeading,
+ wxFont *theFont, bool use16bit) const
{
long x1, y1, descent1, externalLeading1;
GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
}
#endif
-int wxDC::GetDepth(void) const
-{
- return (int) ::GetDeviceCaps((HDC) m_hDC,BITSPIXEL);
-}
+// ---------------------------------------------------------------------------
+// spline drawing code
+// ---------------------------------------------------------------------------
#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;
+public:
+ int type;
+ wxList *points;
- wxSpline(wxList *list);
- void DeletePoints(void);
+ wxSpline(wxList *list);
+ void DeletePoints();
- // Doesn't delete points
- ~wxSpline(void);
+ // Doesn't delete points
+ ~wxSpline();
};
-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);
+void wx_clear_stack();
int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
- double *y3, double *x4, double *y4);
+ 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);
+ 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)
+void wxDC::DoDrawSpline(wxList *list)
{
- wxSpline spline(list);
+ wxSpline spline(list);
- wx_draw_open_spline(this, &spline);
+ wx_draw_open_spline(this, &spline);
}
-
wxList wx_spline_point_list;
void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
while ((node = node->Next()) != NULL)
{
p = (wxPoint *)node->Data();
- x1 = x2;
- y1 = y2;
- x2 = p->x;
- y2 = p->y;
+ 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;
wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
- cx1 = cx4;
- cy1 = cy4;
+ cx1 = cx4;
+ cy1 = cy4;
cx2 = (double)(cx1 + x2) / 2;
cy2 = (double)(cy1 + y2) / 2;
}
/********************* CURVES FOR SPLINES *****************************
- The following spline drawing routine is from
+ 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
+ and
- "On Chaikin's Algorithm" by R. F. Riesenfeld,
- Computer Graphics and Image Processing, 4, Academic Press,
- 1975, 304-310.
+ "On Chaikin's Algorithm" by R. F. Riesenfeld,
+ Computer Graphics and Image Processing, 4, Academic Press,
+ 1975, 304-310.
***********************************************************************/
/* iterative version */
void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
- double b4)
+ double b4)
{
register double xmid, ymid;
double x1, y1, x2, y2, x3, y3, x4, y4;
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) {
+ 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 {
+ } else {
wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
- (double)half(x3, x4), (double)half(y3, y4), x4, y4);
+ (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);
- }
+ (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
+ }
}
}
typedef struct wx_spline_stack_struct {
double x1, y1, x2, y2, x3, y3, x4, y4;
}
- Stack;
+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)
+void wx_clear_stack()
{
wx_stack_top = wx_spline_stack;
wx_stack_count = 0;
double *x3, double *y3, double *x4, double *y4)
{
if (wx_stack_count == 0)
- return (0);
+ return (0);
wx_stack_top--;
wx_stack_count--;
*x1 = wx_stack_top->x1;
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;
+ 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, 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();
- }
+ 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();
+ }
}
wxSpline::wxSpline(wxList *list)
{
- points = list;
+ points = list;
}
-wxSpline::~wxSpline(void)
+wxSpline::~wxSpline()
{
}
-void wxSpline::DeletePoints(void)
+void wxSpline::DeletePoints()
{
- for(wxNode *node = points->First(); node; node = points->First())
- {
- wxPoint *point = (wxPoint *)node->Data();
- delete point;
- delete node;
- }
- delete points;
+ for(wxNode *node = points->First(); node; node = points->First())
+ {
+ wxPoint *point = (wxPoint *)node->Data();
+ delete point;
+ delete node;
+ }
+ delete points;
}
projects / wxWidgets.git / blobdiff