X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89efaf2b6595e59af618556d7e79492cab50c73c..e10972f6c1436a6dcd5427b4e3913bb0f398e045:/include/wx/dcsvg.h?ds=sidebyside

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 45147c68cc..d1b26c1e20 100644
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -33,11 +33,11 @@ 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;
@@ -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
    {
@@ -132,7 +131,7 @@ private:
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 
-   virtual void DoDrawPolygon(int n, wxPoint points[], 
+   virtual void DoDrawPolygon(int n, wxPoint points[],
                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle);
 
@@ -173,31 +172,41 @@ private:
        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 <g> 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)
 };
 
@@ -205,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))
-    { 
+    {
     }
 };