#include "wx/icon.h"
#endif
+#include "wx/sysopt.h"
#include "wx/dcprint.h"
+#include "wx/module.h"
#include <string.h>
#include <math.h>
#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
#include <commdlg.h>
#endif
#include <print.h>
#endif
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
// ---------------------------------------------------------------------------
// constants
// MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
#define DSTCOPY 0x00AA0029 // a.k.a. NOP operation
+// ----------------------------------------------------------------------------
+// macros for logical <-> device coords conversion
+// ----------------------------------------------------------------------------
+
+/*
+ We currently let Windows do all the translations itself so these macros are
+ not really needed (any more) but keep them to enhance readability of the
+ code by allowing to see where are the logical and where are the device
+ coordinates used.
+ */
+
+// logical to device
+#define XLOG2DEV(x) (x)
+#define YLOG2DEV(y) (y)
+
+// device to logical
+#define XDEV2LOG(x) (x)
+#define YDEV2LOG(y) (y)
+
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
// convert degrees to radians
static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// instead of duplicating the same code which sets and then restores text
+// colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
+// encapsulate this in a small helper class
+
+// wxColourChanger: changes the text colours in the ctor if required and
+// restores them in the dtor
+class wxColourChanger
+{
+public:
+ wxColourChanger(wxDC& dc);
+ ~wxColourChanger();
+
+private:
+ wxDC& m_dc;
+
+ COLORREF m_colFgOld, m_colBgOld;
+
+ bool m_changed;
+};
+
// ===========================================================================
// implementation
// ===========================================================================
+// ----------------------------------------------------------------------------
+// wxColourChanger
+// ----------------------------------------------------------------------------
+
+wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+{
+ const wxBrush& brush = dc.GetBrush();
+ if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+ {
+ HDC hdc = GetHdcOf(dc);
+ m_colFgOld = ::GetTextColor(hdc);
+ m_colBgOld = ::GetBkColor(hdc);
+
+ // note that Windows convention is opposite to wxWindows one, this is
+ // why text colour becomes the background one and vice versa
+ const wxColour& colFg = dc.GetTextForeground();
+ if ( colFg.Ok() )
+ {
+ ::SetBkColor(hdc, colFg.GetPixel());
+ }
+
+ const wxColour& colBg = dc.GetTextBackground();
+ if ( colBg.Ok() )
+ {
+ ::SetTextColor(hdc, colBg.GetPixel());
+ }
+
+ SetBkMode(hdc,
+ dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
+ : OPAQUE);
+
+ // flag which telsl us to undo changes in the dtor
+ m_changed = TRUE;
+ }
+ else
+ {
+ // nothing done, nothing to undo
+ m_changed = FALSE;
+ }
+}
+
+wxColourChanger::~wxColourChanger()
+{
+ if ( m_changed )
+ {
+ // restore the colours we changed
+ HDC hdc = GetHdcOf(m_dc);
+
+ ::SetBkMode(hdc, TRANSPARENT);
+ ::SetTextColor(hdc, m_colFgOld);
+ ::SetBkColor(hdc, m_colBgOld);
+ }
+}
+
// ---------------------------------------------------------------------------
// wxDC
// ---------------------------------------------------------------------------
m_oldPen = 0;
m_oldBrush = 0;
m_oldFont = 0;
+#if wxUSE_PALETTE
m_oldPalette = 0;
+#endif // wxUSE_PALETTE
m_bOwnsDC = FALSE;
m_hDC = 0;
-
- m_windowExtX = VIEWPORT_EXTENT;
- m_windowExtY = VIEWPORT_EXTENT;
-
- m_hDCCount = 0;
}
-
wxDC::~wxDC()
{
- if ( m_hDC != 0 ) {
+ if ( m_hDC != 0 )
+ {
SelectOldObjects(m_hDC);
- if ( m_bOwnsDC ) {
- if ( m_canvas == NULL )
- ::DeleteDC(GetHdc());
+
+ // if we own the HDC, we delete it, otherwise we just release it
+
+ if ( m_bOwnsDC )
+ {
+ ::DeleteDC(GetHdc());
+ }
+ else // we don't own our HDC
+ {
+ if (m_canvas)
+ {
+ ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+ }
else
- ::ReleaseDC((HWND)m_canvas->GetHWND(), GetHdc());
+ {
+ // Must have been a wxScreenDC
+ ::ReleaseDC((HWND) NULL, GetHdc());
+ }
}
}
-
}
// This will select current objects out of the DC,
::SelectObject((HDC) dc, (HFONT) m_oldFont);
}
m_oldFont = 0;
+
+#if wxUSE_PALETTE
if (m_oldPalette)
{
- ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
+ ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, FALSE);
}
m_oldPalette = 0;
+#endif // wxUSE_PALETTE
}
m_brush = wxNullBrush;
m_pen = wxNullPen;
+#if wxUSE_PALETTE
m_palette = wxNullPalette;
+#endif // wxUSE_PALETTE
m_font = wxNullFont;
m_backgroundBrush = wxNullBrush;
m_selectedBitmap = wxNullBitmap;
// clipping
// ---------------------------------------------------------------------------
-void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
+void wxDC::UpdateClipBox()
{
- m_clipping = TRUE;
- m_clipX1 = (int)cx;
- m_clipY1 = (int)cy;
- m_clipX2 = (int)(cx + cw);
- m_clipY2 = (int)(cy + ch);
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ RECT rect;
+ ::GetClipBox(GetHdc(), &rect);
- DoClipping((WXHDC) m_hDC);
+ m_clipX1 = (wxCoord) XDEV2LOG(rect.left);
+ m_clipY1 = (wxCoord) YDEV2LOG(rect.top);
+ m_clipX2 = (wxCoord) XDEV2LOG(rect.right);
+ m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom);
}
-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
+void wxDC::SetClippingHrgn(WXHRGN hrgn)
{
- wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
+ wxCHECK_RET( hrgn, wxT("invalid clipping region") );
+
+#ifdef __WXMICROWIN__
+ if (!GetHdc()) return;
+#endif // __WXMICROWIN__
+
+ // note that we combine the new clipping region with the existing one: this
+ // is compatible with what the other ports do and is the documented
+ // behaviour now (starting with 2.3.3)
+#ifdef __WIN16__
+ RECT rectClip;
+ if ( !::GetClipBox(GetHdc(), &rectClip) )
+ return;
+
+ HRGN hrgnDest = ::CreateRectRgn(0, 0, 0, 0);
+ HRGN hrgnClipOld = ::CreateRectRgn(rectClip.left, rectClip.top,
+ rectClip.right, rectClip.bottom);
+
+ if ( ::CombineRgn(hrgnDest, hrgnClipOld, (HRGN)hrgn, RGN_AND) != ERROR )
+ {
+ ::SelectClipRgn(GetHdc(), hrgnDest);
+ }
- wxRect box = region.GetBox();
+ ::DeleteObject(hrgnClipOld);
+ ::DeleteObject(hrgnDest);
+#else // Win32
+ if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
+ {
+ wxLogLastError(_T("ExtSelectClipRgn"));
+
+ return;
+ }
+#endif // Win16/32
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
+ UpdateClipBox();
}
-void wxDC::DoClipping(WXHDC dc)
+void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
- if (m_clipping && dc)
+ // the region coords are always the device ones, so do the translation
+ // manually
+ //
+ // FIXME: possible +/-1 error here, to check!
+ HRGN hrgn = ::CreateRectRgn(LogicalToDeviceX(x),
+ LogicalToDeviceY(y),
+ LogicalToDeviceX(x + w),
+ LogicalToDeviceY(y + h));
+ if ( !hrgn )
{
- IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
- XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
+ wxLogLastError(_T("CreateRectRgn"));
}
+ else
+ {
+ SetClippingHrgn((WXHRGN)hrgn);
+
+ ::DeleteObject(hrgn);
+ }
+}
+
+void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+{
+ SetClippingHrgn(region.GetHRGN());
}
void wxDC::DestroyClippingRegion()
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
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.
+ // 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);
+ ::SelectClipRgn(GetHdc(), rgn);
+ ::DeleteObject(rgn);
}
+
m_clipping = FALSE;
}
bool wxDC::CanGetTextExtent() const
{
+#ifdef __WXMICROWIN__
+ // TODO Extend MicroWindows' GetDeviceCaps function
+ return TRUE;
+#else
// What sort of display is it?
int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);
+#endif
}
int wxDC::GetDepth() const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return 16;
+#endif
+
return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
}
void wxDC::Clear()
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
RECT rect;
if ( m_canvas )
{
(void) ::SetMapMode(GetHdc(), MM_TEXT);
- DWORD colour = GetBkColor(GetHdc());
- HBRUSH brush = CreateSolidBrush(colour);
- FillRect(GetHdc(), &rect, brush);
- DeleteObject(brush);
+ DWORD colour = ::GetBkColor(GetHdc());
+ HBRUSH brush = ::CreateSolidBrush(colour);
+ ::FillRect(GetHdc(), &rect, brush);
+ ::DeleteObject(brush);
+
+ int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+ height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
::SetMapMode(GetHdc(), MM_ANISOTROPIC);
::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
- ::SetWindowExtEx(GetHdc(), m_windowExtX, m_windowExtY, NULL);
+ ::SetWindowExtEx(GetHdc(), width, height, NULL);
::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
}
-void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
+bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
{
- if ( !::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return FALSE;
+#endif
+
+ bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
col.GetPixel(),
style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
- : FLOODFILLBORDER) )
+ : FLOODFILLBORDER) ) ;
+ if (!success)
{
// quoting from the MSDN docs:
//
// * The point is outside the clipping region that is, it is not
// visible on the device.
//
- wxLogLastError("ExtFloodFill");
+ wxLogLastError(wxT("ExtFloodFill"));
}
CalcBoundingBox(x, y);
+
+ return success;
}
bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return FALSE;
+#endif
+
+ wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") );
+
// 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();
- }
-
- // return the color of the pixel
- if( col )
- {
- col->Set(GetRValue(pixelcolor),
- GetGValue(pixelcolor),
- GetBValue(pixelcolor));
- }
+ wxRGBToColour(*col, pixelcolor);
- // check, if color of the pixels is the same as the color of the current
- // pen and return TRUE if it is, FALSE otherwise
- return pixelcolor == pencolor;
+ return TRUE;
}
void wxDC::DoCrossHair(wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
wxCoord x1 = x-VIEWPORT_EXTENT;
wxCoord y1 = y-VIEWPORT_EXTENT;
wxCoord x2 = x+VIEWPORT_EXTENT;
void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
(void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
(void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
- // Normalization: Windows doesn't draw the last point of the line.
- // But apparently neither does GTK+, so we take it out again.
-// (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
-
CalcBoundingBox(x1, y1);
CalcBoundingBox(x2, y2);
}
-void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc)
+// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
+// and ending at (x2, y2)
+void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
+ wxCoord x2, wxCoord y2,
+ wxCoord xc, wxCoord yc)
{
- double dx = xc-x1;
- double dy = yc-y1;
- double radius = (double)sqrt(dx*dx+dy*dy) ;;
- if (x1==x2 && x2==y2)
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+ double dx = xc - x1;
+ double dy = yc - y1;
+ double radius = (double)sqrt(dx*dx+dy*dy);
+ wxCoord r = (wxCoord)radius;
+
+ // treat the special case of full circle separately
+ if ( x1 == x2 && y1 == y2 )
{
- DrawEllipse(xc,yc,(wxCoord)(radius*2.0),(wxCoord)(radius*2.0));
+ DrawEllipse(xc - r, yc - r, 2*r, 2*r);
return;
}
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)
+
+ 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);
+ Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2);
}
else
- Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
- xx1,yy1,xx2,yy2);
+ {
+ Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2);
+ }
- CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius));
- CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius));
+ CalcBoundingBox(xc - r, yc - r);
+ CalcBoundingBox(xc + r, yc + r);
}
void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
wxCoord width, wxCoord height)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
wxCoord x2 = x1 + width,
y2 = y1 + height;
-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__WXMICROWIN__)
RECT rect;
rect.left = x1;
rect.top = y1;
// In WIN16, draw a cross
HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
- HPEN hPenOld = (HPEN)::SelectObject(hdcMem, blackPen);
- HPEN hBrushOld = (HPEN)::SelectObject(hdcMem, whiteBrush);
+ HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen);
+ HPEN hBrushOld = (HPEN)::SelectObject(GetHdc(), whiteBrush);
::SetROP2(GetHdc(), R2_COPYPEN);
Rectangle(GetHdc(), x1, y1, x2, y2);
- MoveTo(GetHdc(), x1, y1);
+ MoveToEx(GetHdc(), x1, y1, NULL);
LineTo(GetHdc(), x2, y2);
- MoveTo(GetHdc(), x2, y1);
+ MoveToEx(GetHdc(), x2, y1, NULL);
LineTo(GetHdc(), x1, y2);
::SelectObject(GetHdc(), hPenOld);
::SelectObject(GetHdc(), hBrushOld);
void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
COLORREF color = 0x00ffffff;
if (m_pen.Ok())
{
void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
{
- COLORREF old_textground = ::GetTextColor(GetHdc());
- COLORREF old_background = ::GetBkColor(GetHdc());
- if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE)
- {
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
- if (m_textForegroundColour.Ok())
- { //just the oposite from what is expected see help on pattern brush
- // 1 in mask becomes bk color
- ::SetBkColor(GetHdc(), m_textForegroundColour.GetPixel() );
- }
- if (m_textBackgroundColour.Ok())
- { //just the oposite from what is expected
- // 0 in mask becomes text color
- ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
-
- if (m_backgroundMode == wxTRANSPARENT)
- SetBkMode(GetHdc(), TRANSPARENT);
- else
- SetBkMode(GetHdc(), OPAQUE);
- }
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// Do things less efficiently if we have offsets
if (xoffset != 0 || yoffset != 0)
(void)Polygon(GetHdc(), (POINT*) points, n);
SetPolyFillMode(GetHdc(),prev);
}
-
- if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE)
- {
- ::SetBkMode(GetHdc(), TRANSPARENT);
- ::SetTextColor(GetHdc(), old_textground);
- ::SetBkColor(GetHdc(), old_background);
- }
}
void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// Do things less efficiently if we have offsets
if (xoffset != 0 || yoffset != 0)
{
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- COLORREF colFgOld = 0,
- colBgOld = 0;
-
- if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
- {
- colFgOld = ::GetTextColor(GetHdc());
- colBgOld = ::GetBkColor(GetHdc());
-
- if ( m_textForegroundColour.Ok() )
- {
- // just the oposite from what is expected see help on pattern brush
- // 1 in mask becomes bk color
- ::SetBkColor(GetHdc(), m_textForegroundColour.GetPixel());
- }
-
- if ( m_textBackgroundColour.Ok() )
- {
- // 0 in mask becomes text color
- ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel());
- }
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
- // VZ: IMHO this does strictly nothing here
- SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
- : OPAQUE);
- }
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
wxCoord x2 = x + width;
wxCoord y2 = y + height;
- // Windows draws the filled rectangles without outline (i.e. drawn with a
- // transparent pen) one pixel smaller in both directions and we want them
- // to have the same size regardless of which pen is used - adjust
- if ( m_pen.GetStyle() == wxTRANSPARENT )
+ if ((m_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT))
{
- x2++;
- y2++;
+ RECT rect;
+ rect.left = XLOG2DEV(x);
+ rect.top = YLOG2DEV(y);
+ rect.right = XLOG2DEV(x2);
+ rect.bottom = YLOG2DEV(y2);
+ (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() );
+ }
+ else
+ {
+ // Windows draws the filled rectangles without outline (i.e. drawn with a
+ // transparent pen) one pixel smaller in both directions and we want them
+ // to have the same size regardless of which pen is used - adjust
+
+ // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
+ if ( m_pen.GetStyle() == wxTRANSPARENT )
+ {
+ x2++;
+ y2++;
+ }
+
+ (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
}
- (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
-
- if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
- {
- // restore the colours we changed
- ::SetBkMode(GetHdc(), TRANSPARENT);
- ::SetTextColor(GetHdc(), colFgOld);
- ::SetBkColor(GetHdc(), colBgOld);
- }
}
void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
// Now, a negative radius value is interpreted to mean
// 'the proportion of the smallest X or Y dimension'
void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
wxCoord x2 = (x+width);
wxCoord y2 = (y+height);
// 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);
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+ wxCoord x2 = x + w;
+ wxCoord y2 = y + h;
int rx1 = XLOG2DEV(x+w/2);
int ry1 = YLOG2DEV(y+h/2);
// 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));
+ HPEN hpenOld = (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);
+ rx1, ry1, rx2, ry2);
}
else
{
(void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
- rx1, ry1-1, rx2, ry2-1);
+ rx1, ry1-1, rx2, ry2-1);
}
- ::SelectObject(GetHdc(), orig_pen);
+
+ ::SelectObject(GetHdc(), hpenOld);
+
(void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
- rx1, ry1, rx2, ry2);
+ rx1, ry1, rx2, ry2);
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
+#ifdef __WIN32__
+ ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
+#else
::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
+#endif
CalcBoundingBox(x, y);
CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
int width = bmp.GetWidth(),
HBITMAP hbmpMask = 0;
+#if wxUSE_PALETTE
+ HPALETTE oldPal = 0;
+#endif // wxUSE_PALETTE
+
if ( useMask )
{
wxMask *mask = bmp.GetMask();
useMask = FALSE;
}
}
-
if ( useMask )
{
#ifdef __WIN32__
- HDC hdcMem = ::CreateCompatibleDC(GetHdc());
- ::SelectObject(hdcMem, GetHbitmapOf(bmp));
-
// use MaskBlt() with ROP which doesn't do anything to dst in the mask
// points
- bool ok = ::MaskBlt(GetHdc(), x, y, width, height,
+ // On some systems, MaskBlt succeeds yet is much much slower
+ // than the wxWindows fall-back implementation. So we need
+ // to be able to switch this on and off at runtime.
+ bool ok = FALSE;
+#if wxUSE_SYSTEM_OPTIONS
+ if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
+#endif
+ {
+ HDC cdc = GetHdc();
+ HDC hdcMem = ::CreateCompatibleDC(GetHdc());
+ HGDIOBJ hOldBitmap = ::SelectObject(hdcMem, GetHbitmapOf(bmp));
+#if wxUSE_PALETTE
+ wxPalette *pal = bmp.GetPalette();
+ if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
+ {
+ oldPal = ::SelectPalette(hdcMem, GetHpaletteOf(*pal), FALSE);
+ ::RealizePalette(hdcMem);
+ }
+#endif // wxUSE_PALETTE
+
+ ok = ::MaskBlt(cdc, x, y, width, height,
hdcMem, 0, 0,
hbmpMask, 0, 0,
MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
- ::DeleteDC(hdcMem);
+
+#if wxUSE_PALETTE
+ if (oldPal)
+ ::SelectPalette(hdcMem, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
+ ::SelectObject(hdcMem, hOldBitmap);
+ ::DeleteDC(hdcMem);
+ }
if ( !ok )
#endif // Win32
::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
}
- ::SelectObject( memdc, hbitmap );
+#if wxUSE_PALETTE
+ wxPalette *pal = bmp.GetPalette();
+ if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
+ {
+ oldPal = ::SelectPalette(memdc, GetHpaletteOf(*pal), FALSE);
+ ::RealizePalette(memdc);
+ }
+#endif // wxUSE_PALETTE
+
+ HGDIOBJ hOldBitmap = ::SelectObject( memdc, hbitmap );
::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);
+
+#if wxUSE_PALETTE
+ if (oldPal)
+ ::SelectPalette(memdc, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
+ ::SelectObject( memdc, hOldBitmap );
::DeleteDC( memdc );
::SetTextColor(GetHdc(), old_textground);
void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
DrawAnyText(text, x, y);
// update the bounding box
void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// prepare for drawing the text
if ( m_textForegroundColour.Ok() )
SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
text.c_str(), text.length()) == 0 )
{
- wxLogLastError("TextOut");
+ wxLogLastError(wxT("TextOut"));
}
// restore the old parameters (text foreground colour may be left because
wxCoord x, wxCoord y,
double angle)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// we test that we have some font because otherwise we should still use the
// "else" part below to avoid that DrawRotatedText(angle = 180) and
// DrawRotatedText(angle = 0) use different fonts (we can't use the default
{
DoDrawText(text, x, y);
}
+#ifndef __WXMICROWIN__
else
{
- // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so
- // can't have non zero orientation/escapement
- wxFont font = m_font.Ok() ? m_font : *wxNORMAL_FONT;
+ // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
+ // because it's not TrueType and so can't have non zero
+ // orientation/escapement under Win9x
+ wxFont font = m_font.Ok() ? m_font : *wxSWISS_FONT;
HFONT hfont = (HFONT)font.GetResourceHandle();
LOGFONT lf;
if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
{
- wxLogLastError("GetObject(hfont)");
+ wxLogLastError(wxT("GetObject(hfont)"));
}
// GDI wants the angle in tenth of degree
hfont = ::CreateFontIndirect(&lf);
if ( !hfont )
{
- wxLogLastError("CreateFont");
+ wxLogLastError(wxT("CreateFont"));
}
else
{
// "upper left" and "upper right"
CalcBoundingBox(x, y);
- CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
+ CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(h*sin(rad)));
// "bottom left" and "bottom right"
x += (wxCoord)(h*sin(rad));
y += (wxCoord)(h*cos(rad));
CalcBoundingBox(x, y);
- CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+ CalcBoundingBox(x + wxCoord(h*sin(rad)), y + wxCoord(h*cos(rad)));
}
+#endif
}
// ---------------------------------------------------------------------------
// set GDI objects
// ---------------------------------------------------------------------------
-void wxDC::SetPalette(const wxPalette& palette)
+#if wxUSE_PALETTE
+
+void wxDC::DoSelectPalette(bool realize)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// 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);
+ ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, FALSE);
m_oldPalette = 0;
}
- m_palette = palette;
-
- if (!m_palette.Ok())
+ 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;
- }
+ HPALETTE oldPal = ::SelectPalette(GetHdc(),
+ GetHpaletteOf(m_palette),
+ FALSE);
+ if (!m_oldPalette)
+ m_oldPalette = (WXHPALETTE) oldPal;
- return;
+ if (realize)
+ ::RealizePalette(GetHdc());
}
+}
- if (m_palette.Ok() && m_palette.GetHPALETTE())
+void wxDC::SetPalette(const wxPalette& palette)
+{
+ if ( palette.Ok() )
{
- HPALETTE oldPal = ::SelectPalette(GetHdc(), (HPALETTE) m_palette.GetHPALETTE(), TRUE);
- if (!m_oldPalette)
- m_oldPalette = (WXHPALETTE) oldPal;
+ m_palette = palette;
+ DoSelectPalette(TRUE);
+ }
+}
+
+void wxDC::InitializePalette()
+{
+ if ( wxDisplayDepth() <= 8 )
+ {
+ // look for any window or parent that has a custom palette. If any has
+ // one then we need to use it in drawing operations
+ wxWindow *win = m_canvas->GetAncestorWithCustomPalette();
- ::RealizePalette(GetHdc());
+ m_hasCustomPalette = win && win->HasCustomPalette();
+ if ( m_hasCustomPalette )
+ {
+ m_palette = win->GetPalette();
+
+ // turn on MSW translation for this palette
+ DoSelectPalette();
+ }
}
}
+#endif // wxUSE_PALETTE
+
void wxDC::SetFont(const wxFont& the_font)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// Set the old object temporarily, in case the assignment deletes an object
// that's not yet selected out.
if (m_oldFont)
void wxDC::SetPen(const wxPen& pen)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// Set the old object temporarily, in case the assignment deletes an object
// that's not yet selected out.
if (m_oldPen)
void wxDC::SetBrush(const wxBrush& brush)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
// Set the old object temporarily, in case the assignment deletes an object
// that's not yet selected out.
if (m_oldBrush)
if (m_brush.Ok())
{
- if (m_brush.GetResourceHandle())
+ // to make sure the brush is alligned with the logical coordinates
+ wxBitmap *stipple = m_brush.GetStipple();
+ if ( stipple && stipple->Ok() )
+ {
+#ifdef __WIN32__
+ ::SetBrushOrgEx(GetHdc(),
+ m_deviceOriginX % stipple->GetWidth(),
+ m_deviceOriginY % stipple->GetHeight(),
+ NULL); // don't need previous brush origin
+#else
+ ::SetBrushOrg(GetHdc(),
+ m_deviceOriginX % stipple->GetWidth(),
+ m_deviceOriginY % stipple->GetHeight());
+#endif
+ }
+
+ if ( m_brush.GetResourceHandle() )
{
HBRUSH b = 0;
b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
void wxDC::SetBackground(const wxBrush& brush)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
m_backgroundBrush = brush;
if (!m_backgroundBrush.Ok())
void wxDC::SetBackgroundMode(int mode)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
m_backgroundMode = mode;
// SetBackgroundColour now only refers to text background
// and m_backgroundMode is used there
-
-/*
- if (m_backgroundMode == wxTRANSPARENT)
- ::SetBkMode(GetHdc(), TRANSPARENT);
- else
- ::SetBkMode(GetHdc(), OPAQUE);
-*/
}
void wxDC::SetLogicalFunction(int function)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
m_logicalFunction = function;
SetRop(m_hDC);
SetROP2(GetHdc(), rop);
}
-bool wxDC::StartDoc(const wxString& message)
+bool wxDC::StartDoc(const wxString& WXUNUSED(message))
{
// We might be previewing, so return TRUE to let it continue.
return TRUE;
wxCoord wxDC::GetCharHeight() const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return 0;
+#endif
+
TEXTMETRIC lpTextMetric;
GetTextMetrics(GetHdc(), &lpTextMetric);
- return YDEV2LOGREL(lpTextMetric.tmHeight);
+ return lpTextMetric.tmHeight;
}
wxCoord wxDC::GetCharWidth() const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return 0;
+#endif
+
TEXTMETRIC lpTextMetric;
GetTextMetrics(GetHdc(), &lpTextMetric);
- return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
+ return lpTextMetric.tmAveCharWidth;
}
void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
wxCoord *descent, wxCoord *externalLeading,
- wxFont *theFont) const
+ wxFont *font) const
{
- wxFont *fontToUse = (wxFont*) theFont;
- if (!fontToUse)
- fontToUse = (wxFont*) &m_font;
+#ifdef __WXMICROWIN__
+ if (!GetHDC())
+ {
+ if (x) *x = 0;
+ if (y) *y = 0;
+ if (descent) *descent = 0;
+ if (externalLeading) *externalLeading = 0;
+ return;
+ }
+#endif // __WXMICROWIN__
+
+ HFONT hfontOld;
+ if ( font )
+ {
+ wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") );
+
+ hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
+ }
+ else // don't change the font
+ {
+ hfontOld = 0;
+ }
SIZE sizeRect;
TEXTMETRIC tm;
- GetTextExtentPoint(GetHdc(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+ GetTextExtentPoint(GetHdc(), string, string.length(), &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 = sizeRect.cx;
+ if (y)
+ *y = sizeRect.cy;
+ if (descent)
+ *descent = tm.tmDescent;
+ if (externalLeading)
+ *externalLeading = tm.tmExternalLeading;
+
+ if ( hfontOld )
+ {
+ ::SelectObject(GetHdc(), hfontOld);
+ }
}
void wxDC::SetMapMode(int mode)
{
- m_mappingMode = mode;
-
- int pixel_width = 0;
- int pixel_height = 0;
- int mm_width = 0;
- int mm_height = 0;
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
- pixel_width = GetDeviceCaps(GetHdc(), HORZRES);
- pixel_height = GetDeviceCaps(GetHdc(), VERTRES);
- mm_width = GetDeviceCaps(GetHdc(), HORZSIZE);
- mm_height = GetDeviceCaps(GetHdc(), VERTSIZE);
+ m_mappingMode = mode;
- if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
+ if ( mode == wxMM_TEXT )
{
- return;
+ m_logicalScaleX =
+ m_logicalScaleY = 1.0;
}
-
- double mm2pixelsX = pixel_width/mm_width;
- double mm2pixelsY = pixel_height/mm_height;
-
- switch (mode)
+ else // need to do some calculations
{
- 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:
+ int pixel_width = ::GetDeviceCaps(GetHdc(), HORZRES),
+ pixel_height = ::GetDeviceCaps(GetHdc(), VERTRES),
+ mm_width = ::GetDeviceCaps(GetHdc(), HORZSIZE),
+ mm_height = ::GetDeviceCaps(GetHdc(), VERTSIZE);
+
+ if ( (mm_width == 0) || (mm_height == 0) )
{
- m_logicalScaleX = (mm2pixelsX/10.0);
- m_logicalScaleY = (mm2pixelsY/10.0);
- break;
+ // we can't calculate mm2pixels[XY] then!
+ return;
}
- default:
- case wxMM_TEXT:
+
+ double mm2pixelsX = pixel_width / mm_width,
+ mm2pixelsY = pixel_height / mm_height;
+
+ switch (mode)
{
- m_logicalScaleX = 1.0;
- m_logicalScaleY = 1.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:
+ wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
}
}
- if (::GetMapMode(GetHdc()) != MM_ANISOTROPIC)
- ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
+ // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
+ // cases we could do with MM_TEXT and in the remaining 0.9% with
+ // MM_ISOTROPIC (TODO!)
+ ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
- 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);
+ int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+ height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
+
+ ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+ ::SetWindowExtEx(GetHdc(), width, height, NULL);
+
+ ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
+ ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
}
void wxDC::SetUserScale(double x, double y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ if ( x == m_userScaleX && y == m_userScaleY )
+ return;
+
m_userScaleX = x;
m_userScaleY = y;
void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
{
- m_signX = xLeftRight ? 1 : -1;
- m_signY = yBottomUp ? -1 : 1;
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
- SetMapMode(m_mappingMode);
+ int signX = xLeftRight ? 1 : -1,
+ signY = yBottomUp ? -1 : 1;
+
+ if ( signX != m_signX || signY != m_signY )
+ {
+ m_signX = signX;
+ m_signY = signY;
+
+ SetMapMode(m_mappingMode);
+ }
}
void wxDC::SetSystemScale(double x, double y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ if ( x == m_scaleX && y == m_scaleY )
+ return;
+
m_scaleX = x;
m_scaleY = y;
void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ if ( x == m_logicalOriginX && y == m_logicalOriginY )
+ return;
+
m_logicalOriginX = x;
m_logicalOriginY = y;
void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ if ( x == m_deviceOriginX && y == m_deviceOriginY )
+ return;
+
m_deviceOriginX = x;
m_deviceOriginY = y;
wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
{
- return (wxCoord) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX);
+ return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;
}
wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
{
- return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));
+ // axis orientation is not taken into account for conversion of a distance
+ return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX));
}
wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
{
- return (wxCoord) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY);
+ return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;
}
wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
{
- return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY));
+ // axis orientation is not taken into account for conversion of a distance
+ return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY));
}
wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
{
- return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);
+ return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;
}
wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
{
- return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);
+ // axis orientation is not taken into account for conversion of a distance
+ return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);
}
wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
{
- return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);
+ return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;
}
wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
{
- return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);
+ // axis orientation is not taken into account for conversion of a distance
+ return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);
}
// ---------------------------------------------------------------------------
bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc,
- int rop, bool useMask)
+ int rop, bool useMask,
+ wxCoord xsrcMask, wxCoord ysrcMask)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return FALSE;
+#endif
+
wxMask *mask = NULL;
if ( useMask )
{
}
}
+ if (xsrcMask == -1 && ysrcMask == -1)
+ {
+ xsrcMask = xsrc; ysrcMask = ysrc;
+ }
+
COLORREF old_textground = ::GetTextColor(GetHdc());
COLORREF old_background = ::GetBkColor(GetHdc());
if (m_textForegroundColour.Ok())
return FALSE;
}
- bool success;
+ bool success = FALSE;
if (useMask)
{
// transparent, so use "DSTCOPY" ROP for the mask points (the usual
// meaning of fg and bg is inverted which corresponds to wxWin notion
// of the mask which is also contrary to the Windows one)
- success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
+
+ // On some systems, MaskBlt succeeds yet is much much slower
+ // than the wxWindows fall-back implementation. So we need
+ // to be able to switch this on and off at runtime.
+#if wxUSE_SYSTEM_OPTIONS
+ if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
+#endif
+ {
+ success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
GetHdcOf(*source), xsrc, ysrc,
- (HBITMAP)mask->GetMaskBitmap(), 0, 0,
+ (HBITMAP)mask->GetMaskBitmap(), xsrcMask, ysrcMask,
MAKEROP4(dwRop, DSTCOPY)) != 0;
+ }
if ( !success )
#endif // Win32
{
// Blit bitmap with mask
+ HDC dc_mask ;
+ HDC dc_buffer ;
+ HBITMAP buffer_bmap ;
+
+#if wxUSE_DC_CACHEING
+ // create a temp buffer bitmap and DCs to access it and the mask
+ wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
+ dc_mask = (HDC) dcCacheEntry1->m_dc;
+
+ wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
+ dc_buffer = (HDC) dcCacheEntry2->m_dc;
+
+ wxDCCacheEntry* bitmapCacheEntry = FindBitmapInCache(GetHDC(),
+ width, height);
+ buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
+#else // !wxUSE_DC_CACHEING
// create a temp buffer bitmap and DCs to access it and the mask
- HDC dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
- HDC dc_buffer = ::CreateCompatibleDC(GetHdc());
- HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
- ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
- ::SelectObject(dc_buffer, buffer_bmap);
+ dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+ dc_buffer = ::CreateCompatibleDC(GetHdc());
+ buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+#endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
+ HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
+ HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
// copy dest to buffer
if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
GetHdc(), xdest, ydest, SRCCOPY) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// copy src to buffer using selected raster op
if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
GetHdcOf(*source), xsrc, ysrc, dwRop) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// 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));
if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
- dc_mask, xsrc, ysrc, SRCAND) )
+ dc_mask, xsrcMask, ysrcMask, SRCAND) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// set unmasked area in dest to BLACK
::SetBkColor(GetHdc(), RGB(0, 0, 0));
::SetTextColor(GetHdc(), RGB(255, 255, 255));
if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
- dc_mask, xsrc, ysrc, SRCAND) )
+ dc_mask, xsrcMask, ysrcMask, SRCAND) )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values
::SetTextColor(GetHdc(), prevCol);
dc_buffer, 0, 0, SRCPAINT) != 0;
if ( !success )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
// tidy up temporary DCs and bitmap
- ::SelectObject(dc_mask, 0);
- ::DeleteDC(dc_mask);
- ::SelectObject(dc_buffer, 0);
- ::DeleteDC(dc_buffer);
- ::DeleteObject(buffer_bmap);
+ ::SelectObject(dc_mask, hOldMaskBitmap);
+ ::SelectObject(dc_buffer, hOldBufferBitmap);
+
+#if !wxUSE_DC_CACHEING
+ {
+ ::DeleteDC(dc_mask);
+ ::DeleteDC(dc_buffer);
+ ::DeleteObject(buffer_bmap);
+ }
+#endif
}
}
else // no mask, just BitBlt() it
GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
if ( !success )
{
- wxLogLastError("BitBlt");
+ wxLogLastError(wxT("BitBlt"));
}
}
::SetTextColor(GetHdc(), old_textground);
void wxDC::DoGetSize(int *w, int *h) const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
}
void wxDC::DoGetSizeMM(int *w, int *h) const
{
- if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZSIZE);
- if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTSIZE);
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
+ // if we implement it in terms of DoGetSize() instead of directly using the
+ // results returned by GetDeviceCaps(HORZ/VERTSIZE) as was done before, it
+ // will also work for wxWindowDC and wxClientDC even though their size is
+ // not the same as the total size of the screen
+ int wPixels, hPixels;
+ DoGetSize(&wPixels, &hPixels);
+
+ if ( w )
+ {
+ int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
+
+ wxCHECK_RET( wTotal, _T("0 width device?") );
+
+ *w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
+ }
+
+ if ( h )
+ {
+ int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
+
+ wxCHECK_RET( hTotal, _T("0 height device?") );
+
+ *h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
+ }
}
wxSize wxDC::GetPPI() const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return wxSize();
+#endif
+
int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);
// For use by wxWindows only, unless custom units are required.
void wxDC::SetLogicalScale(double x, double y)
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
m_logicalScaleX = x;
m_logicalScaleY = y;
}
float *descent, float *externalLeading,
wxFont *theFont, bool use16bit) const
{
+#ifdef __WXMICROWIN__
+ if (!GetHDC()) return;
+#endif
+
wxCoord x1, y1, descent1, externalLeading1;
GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
*x = x1; *y = y1;
}
#endif
-// ---------------------------------------------------------------------------
-// spline drawing code
-// ---------------------------------------------------------------------------
-
-#if wxUSE_SPLINES
-
-class wxSpline: public wxObject
-{
-public:
- int type;
- wxList *points;
-
- wxSpline(wxList *list);
- void DeletePoints();
-
- // Doesn't delete points
- ~wxSpline();
-};
+#if wxUSE_DC_CACHEING
-void wx_draw_open_spline(wxDC *dc, wxSpline *spline);
+/*
+ * This implementation is a bit ugly and uses the old-fashioned wxList class, so I will
+ * improve it in due course, either using arrays, or simply storing pointers to one
+ * entry for the bitmap, and two for the DCs. -- JACS
+ */
-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);
+wxList wxDC::sm_bitmapCache;
+wxList wxDC::sm_dcCache;
-void wxDC::DoDrawSpline(wxList *list)
+wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)
{
- wxSpline spline(list);
-
- wx_draw_open_spline(this, &spline);
+ m_bitmap = hBitmap;
+ m_dc = 0;
+ m_width = w;
+ m_height = h;
+ m_depth = depth;
}
-wxList wx_spline_point_list;
-
-void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
+wxDCCacheEntry::wxDCCacheEntry(WXHDC hDC, int depth)
{
- wxPoint *p;
- double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
- double x1, y1, x2, y2;
-
- wxNode *node = spline->points->First();
- p = (wxPoint *)node->Data();
-
- x1 = p->x;
- y1 = p->y;
-
- node = node->Next();
- p = (wxPoint *)node->Data();
-
- x2 = p->x;
- y2 = p->y;
- cx1 = (double)((x1 + x2) / 2);
- cy1 = (double)((y1 + y2) / 2);
- cx2 = (double)((cx1 + x2) / 2);
- cy2 = (double)((cy1 + y2) / 2);
-
- wx_spline_add_point(x1, y1);
-
- while ((node = node->Next()) != NULL)
- {
- p = (wxPoint *)node->Data();
- x1 = x2;
- y1 = y2;
- x2 = p->x;
- y2 = p->y;
- cx4 = (double)(x1 + x2) / 2;
- cy4 = (double)(y1 + y2) / 2;
- cx3 = (double)(x1 + cx4) / 2;
- cy3 = (double)(y1 + cy4) / 2;
-
- wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
-
- cx1 = cx4;
- cy1 = cy4;
- cx2 = (double)(cx1 + x2) / 2;
- cy2 = (double)(cy1 + y2) / 2;
- }
-
- wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1));
- wx_spline_add_point(x2, y2);
-
- wx_spline_draw_point_array(dc);
-
+ m_bitmap = 0;
+ m_dc = hDC;
+ m_width = 0;
+ m_height = 0;
+ m_depth = depth;
}
-/********************* CURVES FOR SPLINES *****************************
-
- The following spline drawing routine is from
-
- "An Algorithm for High-Speed Curve Generation"
- by George Merrill Chaikin,
- Computer Graphics and Image Processing, 3, Academic Press,
- 1974, 346-349.
-
- and
-
- "On Chaikin's Algorithm" by R. F. Riesenfeld,
- Computer Graphics and Image Processing, 4, Academic Press,
- 1975, 304-310.
-
-***********************************************************************/
-
-#define half(z1, z2) ((z1+z2)/2.0)
-#define THRESHOLD 5
-
-/* iterative version */
-
-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
- double b4)
+wxDCCacheEntry::~wxDCCacheEntry()
{
- register double xmid, ymid;
- double x1, y1, x2, y2, x3, y3, x4, y4;
-
- wx_clear_stack();
- wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
-
- while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
- xmid = (double)half(x2, x3);
- ymid = (double)half(y2, y3);
- if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
- fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
- wx_spline_add_point((double)wx_round(x1), (double)wx_round(y1));
- wx_spline_add_point((double)wx_round(xmid), (double)wx_round(ymid));
- } else {
- wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
- (double)half(x3, x4), (double)half(y3, y4), x4, y4);
- wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
- (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
- }
- }
+ if (m_bitmap)
+ ::DeleteObject((HBITMAP) m_bitmap);
+ if (m_dc)
+ ::DeleteDC((HDC) m_dc);
}
+wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
+{
+ int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+ wxNode* node = sm_bitmapCache.First();
+ while (node)
+ {
+ wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();
-/* utilities used by spline drawing routines */
-
+ if (entry->m_depth == depth)
+ {
+ if (entry->m_width < w || entry->m_height < h)
+ {
+ ::DeleteObject((HBITMAP) entry->m_bitmap);
+ entry->m_bitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h);
+ if ( !entry->m_bitmap)
+ {
+ wxLogLastError(wxT("CreateCompatibleBitmap"));
+ }
+ entry->m_width = w; entry->m_height = h;
+ return entry;
+ }
+ return entry;
+ }
-typedef struct wx_spline_stack_struct {
- double x1, y1, x2, y2, x3, y3, x4, y4;
+ node = node->Next();
+ }
+ WXHBITMAP hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h);
+ if ( !hBitmap)
+ {
+ wxLogLastError(wxT("CreateCompatibleBitmap"));
+ }
+ wxDCCacheEntry* entry = new wxDCCacheEntry(hBitmap, w, h, depth);
+ AddToBitmapCache(entry);
+ return entry;
}
-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()
+wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
{
- wx_stack_top = wx_spline_stack;
- wx_stack_count = 0;
-}
+ int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+ wxNode* node = sm_dcCache.First();
+ while (node)
+ {
+ wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
-{
- wx_stack_top->x1 = x1;
- wx_stack_top->y1 = y1;
- wx_stack_top->x2 = x2;
- wx_stack_top->y2 = y2;
- wx_stack_top->x3 = x3;
- wx_stack_top->y3 = y3;
- wx_stack_top->x4 = x4;
- wx_stack_top->y4 = y4;
- wx_stack_top++;
- wx_stack_count++;
-}
+ // Don't return the same one as we already have
+ if (!notThis || (notThis != entry))
+ {
+ if (entry->m_depth == depth)
+ {
+ return entry;
+ }
+ }
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
- double *x3, double *y3, double *x4, double *y4)
-{
- if (wx_stack_count == 0)
- return (0);
- wx_stack_top--;
- wx_stack_count--;
- *x1 = wx_stack_top->x1;
- *y1 = wx_stack_top->y1;
- *x2 = wx_stack_top->x2;
- *y2 = wx_stack_top->y2;
- *x3 = wx_stack_top->x3;
- *y3 = wx_stack_top->y3;
- *x4 = wx_stack_top->x4;
- *y4 = wx_stack_top->y4;
- return (1);
+ node = node->Next();
+ }
+ WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
+ if ( !hDC)
+ {
+ wxLogLastError(wxT("CreateCompatibleDC"));
+ }
+ wxDCCacheEntry* entry = new wxDCCacheEntry(hDC, depth);
+ AddToDCCache(entry);
+ return entry;
}
-static bool wx_spline_add_point(double x, double y)
+void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)
{
- wxPoint *point = new wxPoint;
- point->x = (int) x;
- point->y = (int) y;
- wx_spline_point_list.Append((wxObject*)point);
- return TRUE;
+ sm_bitmapCache.Append(entry);
}
-static void wx_spline_draw_point_array(wxDC *dc)
+void wxDC::AddToDCCache(wxDCCacheEntry* entry)
{
- 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();
- }
+ sm_dcCache.Append(entry);
}
-wxSpline::wxSpline(wxList *list)
+void wxDC::ClearCache()
{
- points = list;
+ sm_bitmapCache.DeleteContents(TRUE);
+ sm_bitmapCache.Clear();
+ sm_bitmapCache.DeleteContents(FALSE);
+ sm_dcCache.DeleteContents(TRUE);
+ sm_dcCache.Clear();
+ sm_dcCache.DeleteContents(FALSE);
}
-wxSpline::~wxSpline()
+// Clean up cache at app exit
+class wxDCModule : public wxModule
{
-}
+public:
+ virtual bool OnInit() { return TRUE; }
+ virtual void OnExit() { wxDC::ClearCache(); }
-void wxSpline::DeletePoints()
-{
- for(wxNode *node = points->First(); node; node = points->First())
- {
- wxPoint *point = (wxPoint *)node->Data();
- delete point;
- delete node;
- }
- delete points;
-}
+private:
+ DECLARE_DYNAMIC_CLASS(wxDCModule)
+};
+IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
-#endif // wxUSE_SPLINES
+#endif
+ // wxUSE_DC_CACHEING
projects / wxWidgets.git / blobdiff