Added PrependColumn methods and short cuts. Added test for DeleteColumn to sample

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 14d922409ce86dad2a4c31808af85ce47df34d1a..cd3f46d4741b7789f58452da685a540375e926f3 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -9,11 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DCSVG_H
-#define __DCSVG_H
+#ifndef _WX_DCSVG_H_
+#define _WX_DCSVG_H_

 
 

-#include "wx/wfstream.h"

 #include "wx/string.h"
 #include "wx/string.h"

+#include "wx/dc.h"
+
+#if wxUSE_SVG

 
 #define wxSVGVersion wxT("v0100")
 
 
 #define wxSVGVersion wxT("v0100")
 


@@ -22,138 +24,216 @@
 #pragma warn -8066
 #endif
 
 #pragma warn -8066
 #endif
 

-class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
-{
-public:
-    wxSVGFileDC (wxString f);
-    wxSVGFileDC (wxString f, int Width, int Height);
-    wxSVGFileDC (wxString f, int Width, int Height, float dpi);
-    
-    ~wxSVGFileDC();
-
-    bool CanDrawBitmap() const { return true; }
-    bool CanGetTextExtent() const { return true; }
-
-    int GetDepth() const
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; }
-
-    void Clear()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; }
-
-    void DestroyClippingRegion()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; }
+class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;

 
 

-    wxCoord GetCharHeight() const;
-    wxCoord GetCharWidth() const;

 
 

-        void SetClippingRegion(wxCoord  WXUNUSED(x), wxCoord  WXUNUSED(y), wxCoord  WXUNUSED(width), wxCoord  WXUNUSED(height))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion not implemented")); return ; }

 
 

-        void SetPalette(const wxPalette&  WXUNUSED(palette))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette not implemented")); return ; }
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;

 
 

-        void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox not implemented")); return ; }
-
-        void SetLogicalFunction(int  WXUNUSED(function))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented")); return ; }
-
-        int GetLogicalFunction() const
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() not implemented")); return wxCOPY ; }
-
-        void SetBackground( const wxBrush &brush ) ;
-        void SetBackgroundMode( int mode ) ;
-        void SetBrush(const wxBrush& brush) ;
-        void SetFont(const wxFont& font) ;
-        void SetPen(const wxPen& pen)  ;
-          
-        bool IsOk() const {return m_OK;}
+class WXDLLIMPEXP_CORE wxSVGFileImplDC : public wxImplDC
+#else
+#define wxSVGFileImplDC wxSVGFileDC
+class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
+#endif
+{
+public:

 
 

-    virtual wxCoord DeviceToLogicalX(wxCoord x) const;
-    virtual wxCoord DeviceToLogicalY(wxCoord y) const;
-    virtual wxCoord DeviceToLogicalXRel(wxCoord x) const;
-    virtual wxCoord DeviceToLogicalYRel(wxCoord y) const;
-    virtual wxCoord LogicalToDeviceX(wxCoord x) const;
-    virtual wxCoord LogicalToDeviceY(wxCoord y) const;
-    virtual wxCoord LogicalToDeviceXRel(wxCoord x) const;
-    virtual wxCoord LogicalToDeviceYRel(wxCoord y) const ;
+#if wxUSE_NEW_DC
+    wxSVGFileImplDC( 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();
+    
+    bool IsOk() const { return m_OK; }
+
+    virtual bool CanDrawBitmap() const { return true; }
+    virtual bool CanGetTextExtent() const { return true; }
+
+    virtual int GetDepth() const
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented"));
+        return -1;
+    }
+
+    virtual void Clear()
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?"));
+    }
+
+    virtual void DestroyClippingRegion()
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::void Call not yet implemented"));
+    }
+
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;
+
+    virtual void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxCoord WXUNUSED(w), wxCoord WXUNUSED(h))
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::SetClippingRegion not implemented"));
+    }
+
+    virtual void SetPalette(const wxPalette&  WXUNUSED(palette))
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented"));
+    }
+
+    virtual void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y),
+                                wxCoord *WXUNUSED(w), wxCoord *WXUNUSED(h))
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented"));
+    }
+
+    virtual void SetLogicalFunction(int WXUNUSED(function))
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented"));
+    }
+
+    virtual int GetLogicalFunction() const
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented"));
+        return -1;
+    }
+
+    virtual void SetBackground( const wxBrush &brush );
+    virtual void SetBackgroundMode( int mode );
+    virtual void SetBrush(const wxBrush& brush);
+    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 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 );
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );

-
-    virtual void ComputeScaleAndOrigin();
+#endif

 
 private:
 
 private:

-        bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; }
+   virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented"));
+       return true;
+   }
+
+   virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
+                       wxCoord, wxCoord, int = wxCOPY,
+                       bool = 0, int = -1, int = -1);
+
+   virtual void DoCrossHair(wxCoord, wxCoord)
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented"));
+   }

 
 

-        virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *,
-            wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ;
+   virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);

 
 

-        void DoCrossHair(wxCoord, wxCoord)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return  ; }
+   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = 0);

 
 

-        void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
+   virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

 
 

-        void DoDrawBitmap(const class wxBitmap &, wxCoord, wxCoord, bool = 0) ;
+   virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

 
 

-        void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
+   virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                  double sa, double ea);

 
 

-        void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
+   virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord);

 
 

-        void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) ;
+   virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);

 
 

-        void DoDrawIcon(const class wxIcon &, wxCoord, wxCoord) ;
+   virtual void DoDrawLines(int n, wxPoint points[],
+                            wxCoord xoffset = 0, wxCoord yoffset = 0);

 
 

-        void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ;
+   virtual void DoDrawPoint(wxCoord, wxCoord);

 
 

-        void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
+   virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle);

 
 

-        void DoDrawPoint(wxCoord, wxCoord) ;
+   virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

 
 

-        void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ;
+   virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+                                  double angle);

 
 

-        void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
+   virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                       wxCoord w, wxCoord h,
+                                       double radius = 20) ;

 
 

-        void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) ;
+   virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);

 
 

-        void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20)  ;
+   virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                            const wxColour& WXUNUSED(col),
+                            int WXUNUSED(style) = wxFLOOD_SURFACE)
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented"));
+       return false;
+   }

 
 

-        void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+   virtual void DoGetSize(int * x, int *y) const
+   {
+       if ( x )
+           *x = m_width;
+       if ( y )
+           *y = m_height;
+   }

 
 

-        bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col),
-                             int WXUNUSED(style) = wxFLOOD_SURFACE)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; }
+   virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h,
+                                wxCoord *descent = NULL,
+                                wxCoord *externalLeading = NULL,
+                                const wxFont *font = NULL) const;

 
 

-        void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; }
+   virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region))
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion not yet implemented"));
+   }

 
 

-        void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, const wxFont *font = NULL) const ;
+   virtual void DoSetClippingRegion( int WXUNUSED(x),  int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegion not yet implemented"));
+   }

 
 

-        void DoSetClippingRegionAsRegion(const class wxRegion &)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return  ; }
+   virtual void DoGetSizeMM( int *width, int *height ) const;
+   
+   virtual wxSize GetPPI() const;

 
 

-       void Init (wxString f, int Width, int Height, float dpi);
+   void Init (const wxString &filename, int width, int height, double dpi);

 
 

-       void NewGraphics();
-       
-       void write( const wxString &s );
+   void NewGraphics();
+
+   void write( const wxString &s );

 
 private:
 
 private:

-    wxFileOutputStream *m_outfile;
-    wxString            m_filename;
-    int                 m_sub_images; // number of png format images we have
-    bool                m_OK;
-    bool                m_graphics_changed;
-    int                 m_width, m_height;
-    double              m_mm_to_pix_x, m_mm_to_pix_y;
-    
+   wxFileOutputStream *m_outfile;
+   wxString            m_filename;
+   int                 m_sub_images; // number of png format images we have
+   bool                m_OK;
+   bool                m_graphics_changed;
+   int                 m_width, m_height;
+   double              m_dpi;
+

 private:
 private:

-    DECLARE_ABSTRACT_CLASS(wxSVGFileDC)
+   DECLARE_ABSTRACT_CLASS(wxSVGFileImplDC)

 };
 
 };
 

-#endif      // __DCSVG_H
+
+#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 )
+    { 
+        m_pimpl = new wxSVGFileImplDC( this, filename, width, height, dpi );
+    }
+};
+#endif
+
+
+#endif // wxUSE_SVG
+
+#endif // _WX_DCSVG_H_