X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac43092b9d4f932c3a911fca29f51de3fe094d7c..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/dcgraph.h?ds=sidebyside diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 7e44ef7221..364d435894 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -14,35 +14,40 @@ #if wxUSE_GRAPHICS_CONTEXT +#include "wx/dc.h" #include "wx/geometry.h" -#include "wx/dynarray.h" #include "wx/graphics.h" class WXDLLIMPEXP_FWD_CORE wxWindowDC; -class WXDLLEXPORT wxGCDC: public wxDC +class WXDLLIMPEXP_CORE wxGCDC: public wxDC { public: wxGCDC( const wxWindowDC& dc ); wxGCDC( const wxMemoryDC& dc ); +#if wxUSE_PRINTING_ARCHITECTURE + wxGCDC( const wxPrinterDC& dc ); +#endif wxGCDC(); - + virtual ~wxGCDC(); + wxGraphicsContext* GetGraphicsContext(); void SetGraphicsContext( wxGraphicsContext* ctx ); -private: DECLARE_DYNAMIC_CLASS(wxGCDC) - DECLARE_NO_COPY_CLASS(wxGCDC) + wxDECLARE_NO_COPY_CLASS(wxGCDC); }; - -class WXDLLEXPORT wxGCDCImpl: public wxDCImpl +class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl { public: wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ); wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ); +#if wxUSE_PRINTING_ARCHITECTURE + wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); +#endif wxGCDCImpl( wxDC *owner ); virtual ~wxGCDCImpl(); @@ -81,9 +86,9 @@ public: virtual int GetDepth() const; virtual wxSize GetPPI() const; - virtual void SetMapMode(int mode); + virtual void SetMapMode(wxMappingMode mode); - virtual void SetLogicalFunction(int function); + virtual void SetLogicalFunction(wxRasterOperationMode function); virtual void SetTextForeground(const wxColour& colour); virtual void SetTextBackground(const wxColour& colour); @@ -93,10 +98,9 @@ public: wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; } virtual void SetGraphicsContext( wxGraphicsContext* ctx ); -protected: // the true implementations virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - int style = wxFLOOD_SURFACE); + wxFloodFillStyle style = wxFLOOD_SURFACE); virtual void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, @@ -145,15 +149,16 @@ protected: double angle); virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); + wxDC *source, wxCoord xsrc, wxCoord ysrc, + wxRasterOperationMode rop = wxCOPY, bool useMask = false, + wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight, - int rop = wxCOPY, bool useMask = false, + wxRasterOperationMode = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); virtual void DoGetSize(int *,int *) const; @@ -162,13 +167,13 @@ protected: virtual void DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset); virtual void DoDrawPolygon(int n, wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - int fillStyle = wxODDEVEN_RULE); + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle = wxODDEVEN_RULE); virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - int fillStyle); + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle); - virtual void DoSetClippingRegionAsRegion(const wxRegion& region); + virtual void DoSetDeviceClippingRegion(const wxRegion& region); virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); @@ -191,11 +196,9 @@ protected: wxGraphicsContext* m_graphicContext; -private: DECLARE_CLASS(wxGCDCImpl) - DECLARE_NO_COPY_CLASS(wxGCDCImpl) + wxDECLARE_NO_COPY_CLASS(wxGCDCImpl); }; -#endif - +#endif // wxUSE_GRAPHICS_CONTEXT #endif // _WX_GRAPHICS_DC_H_