synchronize GTK2 minimum version in docs

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 2ac99a25485adf363187ee0abcd3fce9930510d0..cf492e7938160134cacd958cc386ebce052358bf 100644 (file)
--- 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:
 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();
                      int width=320, int height=240, double dpi=72.0 );
 
     virtual ~wxSVGFileDCImpl();

-    
+

     bool IsOk() const { return m_OK; }
 
     virtual bool CanDrawBitmap() const { return true; }
     bool IsOk() const { return m_OK; }
 
     virtual bool CanDrawBitmap() const { return true; }


@@ -79,15 +79,15 @@ public:
         wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented"));
     }
 
         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"));
     }
 
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented"));
     }
 

-    virtual int GetLogicalFunction() const
+    virtual wxRasterOperationMode GetLogicalFunction() const

     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented"));
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented"));

-        return -1;
+        return wxCOPY;

     }
 
     virtual void SetBackground( const wxBrush &brush );
     }
 
     virtual void SetBackground( const wxBrush &brush );


@@ -104,7 +104,7 @@ private:
    }
 
    virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
    }
 
    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)
                        bool = 0, int = -1, int = -1);
 
    virtual void DoCrossHair(wxCoord, wxCoord)


@@ -114,7 +114,7 @@ private:
 
    virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
 
 
    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);
 
 
    virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 


@@ -132,7 +132,9 @@ private:
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 
 
    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);
 
 
    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 


@@ -147,7 +149,7 @@ private:
 
    virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
                             const wxColour& WXUNUSED(col),
 
    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;
    {
        wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented"));
        return false;


@@ -166,9 +168,9 @@ private:
                                 wxCoord *externalLeading = NULL,
                                 const wxFont *font = NULL) const;
 
                                 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) )
    }
 
    virtual void DoSetClippingRegion( int WXUNUSED(x),  int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )


@@ -177,7 +179,7 @@ private:
    }
 
    virtual void DoGetSizeMM( int *width, int *height ) const;
    }
 
    virtual void DoGetSizeMM( int *width, int *height ) const;

-   
+

    virtual wxSize GetPPI() const;
 
    void Init (const wxString &filename, int width, int height, double dpi);
    virtual wxSize GetPPI() const;
 
    void Init (const wxString &filename, int width, int height, double dpi);


@@ -203,12 +205,12 @@ private:
 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 public:
 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))
                 int width = 320,
                 int height = 240,
                 double dpi = 72.0)
         : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))

-    { 
+    {

     }
 };
 
     }
 };