Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / include / wx / dcsvg.h

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index cae6308db4f3f2ec9dc2085cc51efa1c55c76a19..ee99a8e703cd4140b367142805b20a693241597b 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -54,10 +54,7 @@ public:
         wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?"));
     }
 
         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;
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;


@@ -129,12 +126,12 @@ private:
 
    virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 
 
    virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 

-   virtual void DoDrawLines(int n, wxPoint points[],
+   virtual void DoDrawLines(int n, const wxPoint points[],

                             wxCoord xoffset = 0, wxCoord yoffset = 0);
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 
                             wxCoord xoffset = 0, wxCoord yoffset = 0);
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 

-   virtual void DoDrawPolygon(int n, wxPoint points[],
+   virtual void DoDrawPolygon(int n, const wxPoint points[],

                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle);
 
                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle);
 


@@ -175,10 +172,7 @@ private:
        wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion 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 void DoGetSizeMM( int *width, int *height ) const;
 


@@ -186,20 +180,33 @@ private:
 
    void Init (const wxString &filename, int width, int height, double dpi);
 
 
    void Init (const wxString &filename, int width, int height, double dpi);
 

-   void NewGraphics();
-

    void write( const wxString &s );
 
 private:
    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;
    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;
 
    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)
 };
 
    DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
 };