X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0e0d66151c930ea402f96925d8d4dc9bb514c09..218847660e9d14a2348586120c88f56c49a4dae7:/include/wx/dc.h diff --git a/include/wx/dc.h b/include/wx/dc.h index f389a8b5a7..4ce01bb4bd 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -3,6 +3,7 @@ #ifdef __GNUG__ #pragma interface "dcbase.h" + #pragma implementation "dcbase.h" #endif // ---------------------------------------------------------------------------- @@ -56,7 +57,7 @@ public: m_deviceOriginX = m_deviceOriginY = 0; m_logicalScaleX = m_logicalScaleY = - m_userScaleX = m_userScaleY = + m_userScaleX = m_userScaleY = m_scaleX = m_scaleY = 1.0; m_logicalFunction = -1; @@ -180,6 +181,8 @@ public: void DrawRoundedRectangle(const wxRect& r, double radius) { DoDrawRoundedRectangle(r.x, r.y, r.width, r.height, radius); } + void DrawCircle(long x, long y, long radius) + { DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); } void DrawEllipse(long x, long y, long width, long height) { DoDrawEllipse(x, y, width, height); } void DrawEllipse(const wxPoint& pt, const wxSize& sz) @@ -395,8 +398,6 @@ public: if ( x ) *x = m_userScaleX; if ( y ) *y = m_userScaleY; } - void SetSystemScale(double x, double y) - { SetUserScale(x, y); } virtual void SetUserScale(double x, double y) = 0; virtual void GetLogicalScale(double *x, double *y) @@ -542,7 +543,9 @@ protected: if ( y ) *y = m_deviceOriginY; } +#if wxUSE_SPLINES virtual void DoDrawSpline(wxList *points) = 0; +#endif protected: // flags