X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3b81044ee30ead362ba6e1bf95af13248afe41c..5e6f2fe9210327222ff2e244d2722a0d3641109a:/include/wx/msw/dc.h diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index 9e6f7fcab8..fc9f9477a2 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -78,13 +78,14 @@ public: virtual int GetDepth() const; virtual wxSize GetPPI() const; + virtual void SetMapMode(int mode); virtual void SetUserScale(double x, double y); - virtual void SetSystemScale(double x, double y); virtual void SetLogicalScale(double x, double y); virtual void SetLogicalOrigin(wxCoord x, wxCoord y); virtual void SetDeviceOrigin(wxCoord x, wxCoord y); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); + virtual void SetLogicalFunction(int function); // implementation from now on @@ -162,11 +163,13 @@ protected: // classes wxDC() { Init(); } + void RealizeScaleAndOrigin(); + virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - wxFont *theFont = NULL) const; + const wxFont *theFont = NULL) const; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, @@ -197,7 +200,7 @@ protected: virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); #if wxUSE_SPLINES - virtual void DoDrawSpline(wxList *points); + virtual void DoDrawSpline(const wxPointList *points); #endif virtual void DoCrossHair(wxCoord x, wxCoord y);