X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dd36d1d691f566e42cc0442e56a6f80bc3c0025..e78c1d7855d1fefcdbff0e093e21e5cf101ca604:/include/wx/dcgraph.h diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 46781cc4e7..820c6780c7 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -16,35 +16,34 @@ #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 ); + wxGCDC( const wxPrinterDC& 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 +class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl { public: wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ); wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ); + wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); wxGCDCImpl( wxDC *owner ); virtual ~wxGCDCImpl(); @@ -95,7 +94,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); @@ -193,11 +191,9 @@ protected: wxGraphicsContext* m_graphicContext; -private: DECLARE_CLASS(wxGCDCImpl) DECLARE_NO_COPY_CLASS(wxGCDCImpl) }; -#endif - +#endif // wxUSE_GRAPHICS_CONTEXT #endif // _WX_GRAPHICS_DC_H_