X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..f9bb777f88b5c93054e0ba0c2f1d5d9186f97a33:/include/wx/dcsvg.h?ds=inline

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index b30d21790c..8921784aae 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();
     
@@ -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
    {
@@ -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);
 
@@ -187,9 +166,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 +200,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