X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/dcsvg.h

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index b30d21790c..45147c68cc 100644
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -28,24 +28,13 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
 
 
 
-#if wxUSE_NEW_DC
-class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;
+class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
 
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
-#else
-#define wxSVGFileDCImpl wxSVGFileDC
-class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
-#endif
 {
 public:
-
-#if wxUSE_NEW_DC
     wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, 
                      int width=320, int height=240, double dpi=72.0 );
-#else
-    wxSVGFileDC( const wxString &filename,
-                 int width=320, int height=240, double dpi=72.0 );
-#endif
 
     virtual ~wxSVGFileDCImpl();
     
@@ -90,15 +79,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 );
@@ -107,16 +96,6 @@ public:
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
 
-#if wxUSE_NEW_DC
-#else
-    virtual void SetMapMode( int mode );
-    virtual void SetUserScale( double x, double y );
-    virtual void SetLogicalScale( double x, double y );
-    virtual void SetLogicalOrigin( wxCoord x, wxCoord y );
-    virtual void SetDeviceOrigin( wxCoord x, wxCoord y );
-    virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-#endif
-
 private:
    virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
    {
@@ -125,7 +104,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)
@@ -135,7 +114,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);
 
@@ -153,7 +132,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);
 
@@ -168,7 +149,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;
@@ -187,9 +168,9 @@ 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) )
@@ -221,18 +202,17 @@ private:
 };
 
 
-#if wxUSE_NEW_DC
 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 public:
-    wxSVGFileDC( const wxString &filename, 
-                 int width=320, int height=240, double dpi=72.0 )
+    wxSVGFileDC(const wxString& filename, 
+                int width = 320,
+                int height = 240,
+                double dpi = 72.0)
+        : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))
     { 
-        m_pimpl = new wxSVGFileDCImpl( this, filename, width, height, dpi );
     }
 };
-#endif
-
 
 #endif // wxUSE_SVG