need to overload assertEquals(int,short) too to resolve ambiguity

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index b4eb84afa157755420ef01899265299bb6ad1ed7..8921784aae2ea7b87b9eaf9ac350306ec8597a61 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
 
 
 
 
 
 

-class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;
+class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;

 
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
 
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {


@@ -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);
 


@@ -166,9 +166,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) )


@@ -203,10 +203,12 @@ private:
 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 public:
 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 );

     }
 };
 
     }
 };