Compilation fix (CreateTimerImpl is taken from timerunx.cpp, so not inline).

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index cd3f46d4741b7789f58452da685a540375e926f3..2ac99a25485adf363187ee0abcd3fce9930510d0 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -28,26 +28,15 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
 
 
 
-#if wxUSE_NEW_DC
-class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;
+class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
 
-class WXDLLIMPEXP_CORE wxSVGFileImplDC : public wxImplDC
-#else
-#define wxSVGFileImplDC wxSVGFileDC
-class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
-#endif
+class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
 public:
-
-#if wxUSE_NEW_DC
-    wxSVGFileImplDC( wxSVGFileDC *owner, const wxString &filename, 
+    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 ~wxSVGFileImplDC();
+    virtual ~wxSVGFileDCImpl();
     
     bool IsOk() const { return m_OK; }
 
@@ -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
    {
@@ -217,22 +196,21 @@ private:
    double              m_dpi;
 
 private:
-   DECLARE_ABSTRACT_CLASS(wxSVGFileImplDC)
+   DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
 };
 
 
-#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 wxSVGFileImplDC( this, filename, width, height, dpi );
     }
 };
-#endif
-
 
 #endif // wxUSE_SVG