X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d770c4f8204938933914a961d4142f97ec12f50..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/dcgraph.h diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 38ebbb61cc..d010b63ae4 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -32,6 +32,8 @@ public: #if defined(__WXMSW__) && wxUSE_ENH_METAFILE wxGCDC( const wxEnhMetaFileDC& dc ); #endif + wxGCDC(wxGraphicsContext* context); + wxGCDC(); virtual ~wxGCDC(); @@ -66,9 +68,6 @@ public: virtual ~wxGCDCImpl(); - void Init(); - - // implement base class pure virtuals // ---------------------------------- @@ -100,8 +99,6 @@ public: virtual int GetDepth() const; virtual wxSize GetPPI() const; - virtual void SetMapMode(wxMappingMode mode); - virtual void SetLogicalFunction(wxRasterOperationMode function); virtual void SetTextForeground(const wxColour& colour); @@ -112,6 +109,8 @@ public: wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; } virtual void SetGraphicsContext( wxGraphicsContext* ctx ); + virtual void* GetHandle() const; + // the true implementations virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, wxFloodFillStyle style = wxFLOOD_SURFACE); @@ -204,9 +203,12 @@ public: #endif // __WXMSW__ protected: + // unused int parameter distinguishes this version, which does not create a + // wxGraphicsContext, in the expectation that the derived class will do it + wxGCDCImpl(wxDC* owner, int); + // scaling variables bool m_logicalFunctionSupported; - double m_mm_to_pix_x, m_mm_to_pix_y; wxGraphicsMatrix m_matrixOriginal; wxGraphicsMatrix m_matrixCurrent; @@ -214,6 +216,9 @@ protected: wxGraphicsContext* m_graphicContext; +private: + void Init(wxGraphicsContext*); + DECLARE_CLASS(wxGCDCImpl) wxDECLARE_NO_COPY_CLASS(wxGCDCImpl); };