X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/dcgraph.h?ds=sidebyside diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 61d7104efa..d51692eb4f 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -14,8 +14,8 @@ #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; @@ -27,17 +27,16 @@ public: wxGCDC( const wxWindowDC& dc ); wxGCDC( const wxMemoryDC& dc ); wxGCDC(); - + virtual ~wxGCDC(); + wxGraphicsContext* GetGraphicsContext(); void SetGraphicsContext( wxGraphicsContext* ctx ); -private: DECLARE_DYNAMIC_CLASS(wxGCDC) DECLARE_NO_COPY_CLASS(wxGCDC) }; - class WXDLLEXPORT wxGCDCImpl: public wxDCImpl { public: @@ -82,12 +81,7 @@ public: virtual wxSize GetPPI() const; virtual void SetMapMode(int mode); - virtual void SetUserScale(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); virtual void SetTextForeground(const wxColour& colour); @@ -98,7 +92,6 @@ 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); @@ -196,11 +189,9 @@ protected: wxGraphicsContext* m_graphicContext; -private: DECLARE_CLASS(wxGCDCImpl) DECLARE_NO_COPY_CLASS(wxGCDCImpl) }; -#endif - +#endif // wxUSE_GRAPHICS_CONTEXT #endif // _WX_GRAPHICS_DC_H_