added wxGrid::UseNativeColHeader() (column reordering doesn't work yet); more wxGrid...

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 9c0a34e6049fbd20f8572b6663517e4411c4567e..8921784aae2ea7b87b9eaf9ac350306ec8597a61 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -26,14 +26,19 @@
 
 class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
 
-class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
+
+
+class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
+
+class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
 public:
-    wxSVGFileDC (wxString f);
-    wxSVGFileDC (wxString f, int Width, int Height);
-    wxSVGFileDC (wxString f, int Width, int Height, float dpi);
+    wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, 
+                     int width=320, int height=240, double dpi=72.0 );
 
-    virtual ~wxSVGFileDC();
+    virtual ~wxSVGFileDCImpl();
+    
+    bool IsOk() const { return m_OK; }
 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
@@ -91,15 +96,6 @@ public:
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
 
-    virtual bool IsOk() const {return m_OK;}
-
-    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 );
-
 private:
    virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
    {
@@ -118,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);
 
@@ -170,12 +166,21 @@ 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::DoSetDeviceClippingRegion not yet implemented"));
+   }
+
+   virtual void DoSetClippingRegion( int WXUNUSED(x),  int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
    {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented"));
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegion not yet implemented"));
    }
 
-   void Init (wxString f, int Width, int Height, float dpi);
+   virtual void DoGetSizeMM( int *width, int *height ) const;
+   
+   virtual wxSize GetPPI() const;
+
+   void Init (const wxString &filename, int width, int height, double dpi);
 
    void NewGraphics();
 
@@ -188,9 +193,23 @@ private:
    bool                m_OK;
    bool                m_graphics_changed;
    int                 m_width, m_height;
+   double              m_dpi;
 
 private:
-   DECLARE_ABSTRACT_CLASS(wxSVGFileDC)
+   DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
+};
+
+
+class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
+{
+public:
+    wxSVGFileDC(const wxString& filename, 
+                int width = 320,
+                int height = 240,
+                double dpi = 72.0)
+        : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))
+    { 
+    }
 };
 
 #endif // wxUSE_SVG