X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0875501313903140a41dca0ba6ee2d85ed0536c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/dcsvg.h diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h index 72544270eb..d1b26c1e20 100644 --- a/include/wx/dcsvg.h +++ b/include/wx/dcsvg.h @@ -28,16 +28,16 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream; -class WXDLLIMPEXP_FWD_BASE wxSVGFileDC; +class WXDLLIMPEXP_FWD_CORE wxSVGFileDC; class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl { public: - wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, + wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, int width=320, int height=240, double dpi=72.0 ); virtual ~wxSVGFileDCImpl(); - + bool IsOk() const { return m_OK; } virtual bool CanDrawBitmap() const { return true; } @@ -54,10 +54,7 @@ public: wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); } - virtual void DestroyClippingRegion() - { - wxFAIL_MSG(wxT("wxSVGFILEDC::void Call not yet implemented")); - } + virtual void DestroyClippingRegion(); virtual wxCoord GetCharHeight() const; virtual wxCoord GetCharWidth() const; @@ -79,15 +76,15 @@ public: wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented")); } - virtual void SetLogicalFunction(int WXUNUSED(function)) + virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) { wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented")); } - virtual int GetLogicalFunction() const + virtual wxRasterOperationMode GetLogicalFunction() const { wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented")); - return -1; + return wxCOPY; } virtual void SetBackground( const wxBrush &brush ); @@ -96,6 +93,8 @@ public: virtual void SetFont(const wxFont& font); virtual void SetPen(const wxPen& pen); + virtual void* GetHandle() const { return NULL; } + private: virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const { @@ -104,7 +103,7 @@ private: } virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *, - wxCoord, wxCoord, int = wxCOPY, + wxCoord, wxCoord, wxRasterOperationMode = wxCOPY, bool = 0, int = -1, int = -1); virtual void DoCrossHair(wxCoord, wxCoord) @@ -114,7 +113,7 @@ private: virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord); - virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = 0); + virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false); virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h); @@ -132,7 +131,9 @@ private: virtual void DoDrawPoint(wxCoord, wxCoord); - virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle); + virtual void DoDrawPolygon(int n, wxPoint points[], + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle); virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h); @@ -147,7 +148,7 @@ private: virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col), - int WXUNUSED(style) = wxFLOOD_SURFACE) + wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) { wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false; @@ -166,36 +167,46 @@ private: wxCoord *externalLeading = NULL, const wxFont *font = NULL) const; - virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region)) + virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) { - wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion not yet implemented")); + wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion not yet implemented")); } - virtual void DoSetClippingRegion( int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) - { - wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegion not yet implemented")); - } + virtual void DoSetClippingRegion(int x, int y, int width, int height); virtual void DoGetSizeMM( int *width, int *height ) const; - + virtual wxSize GetPPI() const; void Init (const wxString &filename, int width, int height, double dpi); - void NewGraphics(); - void write( const wxString &s ); private: + // If m_graphics_changed is true, close the current element and start a + // new one for the last pen/brush change. + void NewGraphicsIfNeeded(); + + // Open a new graphics group setting up all the attributes according to + // their current values in wxDC. + void DoStartNewGraphics(); + wxFileOutputStream *m_outfile; wxString m_filename; int m_sub_images; // number of png format images we have bool m_OK; - bool m_graphics_changed; + bool m_graphics_changed; // set by Set{Brush,Pen}() int m_width, m_height; double m_dpi; -private: + // The clipping nesting level is incremented by every call to + // SetClippingRegion() and reset when DestroyClippingRegion() is called. + size_t m_clipNestingLevel; + + // Unique ID for every clipping graphics group: this is simply always + // incremented in each SetClippingRegion() call. + size_t m_clipUniqueId; + DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl) }; @@ -203,12 +214,12 @@ private: class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC { public: - wxSVGFileDC(const wxString& filename, + wxSVGFileDC(const wxString& filename, int width = 320, int height = 240, double dpi = 72.0) : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi)) - { + { } };