Change EnsureVisble() to including column parameter, implemented it for wxGTK

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index ce5b4a2218d16bc1552a30bbc9f5fe15ef967755..9c0a34e6049fbd20f8572b6663517e4411c4567e 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -1,315 +1,198 @@
-#ifndef __DCSVG_H
-#define __DCSVG_H
-#include <wx/wfstream.h>
-#include <wx/string.h>
-
-#ifdef WXMAKINGDLL_SVG
-    #define WXDLLIMPEXP_SVG WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_SVG WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_SVG
-#endif
-
-#define wxSVGVersion wxT("v0100")
-#ifdef __BORLANDC__
-#pragma warn -rch
-#pragma warn -ccc
-#endif
-
-class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
-{
-
-    private:
-        wxFileOutputStream * m_outfile ;
-        wxString m_filename ;
-        //holds number of png format images we have
-        int m_sub_images ;
-        bool m_OK, m_graphics_changed ;
-        int m_width, m_height ;
-
-        double
-            m_logicalScaleX,
-            m_logicalScaleY,
-            m_userScaleX,
-            m_userScaleY,
-            m_scaleX,
-            m_scaleY,
-            m_OriginX,
-            m_OriginY,
-            m_mm_to_pix_x,
-            m_mm_to_pix_y;
-
-        bool
-            m_needComputeScaleX,
-            m_needComputeScaleY; // not yet used
-
-
-        bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; };
-
-        virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *,
-            wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ;
-
-        void DoCrossHair(wxCoord, wxCoord)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return  ; };
-
-        void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcsvg.h
+// Purpose:     wxSVGFileDC
+// Author:      Chris Elliott
+// Modified by:
+// Created:
+// Copyright:   (c) Chris Elliott
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////

 
 

-        void DoDrawBitmap(const class wxBitmap &, wxCoord, wxCoord, bool = 0) ;
+#ifndef _WX_DCSVG_H_
+#define _WX_DCSVG_H_

 
 

-        void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
+#include "wx/string.h"
+#include "wx/dc.h"

 
 

-        void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
+#if wxUSE_SVG

 
 

-        void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) ;
-
-        void DoDrawIcon(const class wxIcon &, wxCoord, wxCoord) ;
-
-        void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ;
-
-        void DoDrawPoint(wxCoord, wxCoord) ;
-
-        void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ;
-
-        void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) ;
-
-        void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20)  ;
-
-        void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-
-        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 ; };
-
-        void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } ;
-
-        void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ;
-
-        void DoSetClippingRegionAsRegion(const class wxRegion &)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return  ; };
-
-       void Init (wxString f, int Width, int Height, float dpi);
-
-       void NewGraphics () ;
+#define wxSVGVersion wxT("v0100")

 
 

-#ifdef XDEV2LOG
-#undef XDEV2LOG
-#endif
-        wxCoord XDEV2LOG(wxCoord x) const
-        {
-            wxCoord new_x = x - m_deviceOriginX;
-            if (new_x > 0)
-                return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-            else
-                return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-        }
-#ifdef XDEV2LOGREL
-#undef XDEV2LOGREL
-#endif
-        wxCoord XDEV2LOGREL(wxCoord x) const
-        {
-            if (x > 0)
-                return (wxCoord)((double)(x) / m_scaleX + 0.5);
-            else
-                return (wxCoord)((double)(x) / m_scaleX - 0.5);
-        }
-#ifdef YDEV2LOG
-#undef YDEV2LOG
-#endif
-        wxCoord YDEV2LOG(wxCoord y) const
-        {
-            wxCoord new_y = y - m_deviceOriginY;
-            if (new_y > 0)
-                return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-            else
-                return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-        }
-#ifdef YDEV2LOGREL
-#undef YDEV2LOGREL
-#endif
-        wxCoord YDEV2LOGREL(wxCoord y) const
-        {
-            if (y > 0)
-                return (wxCoord)((double)(y) / m_scaleY + 0.5);
-            else
-                return (wxCoord)((double)(y) / m_scaleY - 0.5);
-        }
-#ifdef XLOG2DEV
-#undef XLOG2DEV
-#endif
-        wxCoord XLOG2DEV(wxCoord x) const
-        {
-            wxCoord new_x = x - m_logicalOriginX;
-            if (new_x > 0)
-                return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-            else
-                return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
-        }
-#ifdef XLOG2DEVREL
-#undef XLOG2DEVREL
-#endif
-        wxCoord XLOG2DEVREL(wxCoord x) const
-        {
-            if (x > 0)
-                return (wxCoord)((double)(x) * m_scaleX + 0.5);
-            else
-                return (wxCoord)((double)(x) * m_scaleX - 0.5);
-        }
-#ifdef YLOG2DEV
-#undef YLOG2DEV
-#endif
-        wxCoord YLOG2DEV(wxCoord y) const
-        {
-            wxCoord new_y = y - m_logicalOriginY;
-            if (new_y > 0)
-                return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-            else
-                return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
-        }
-#ifdef YLOG2DEVREL
-#undef YLOG2DEVREL
+#ifdef __BORLANDC__
+#pragma warn -8008
+#pragma warn -8066

 #endif
 #endif

-        wxCoord YLOG2DEVREL(wxCoord y) const
-        {
-            if (y > 0)
-                return (wxCoord)((double)(y) * m_scaleY + 0.5);
-            else
-                return (wxCoord)((double)(y) * m_scaleY - 0.5);
-        }
-
-        void write(const wxString &s);
-
-    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 BeginDrawing() { return;};
+class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;

 
 

-        bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false)
-            { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); };
-
-        void Clear()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; };
-
-        void CrossHair(wxCoord x, wxCoord y)
-            { DoCrossHair (x,y); return; };
-
-        virtual void ComputeScaleAndOrigin();
-
-        void DestroyClippingRegion()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };
-
-        wxCoord DeviceToLogicalX(wxCoord x) const ;
-
-        wxCoord DeviceToLogicalXRel(wxCoord x)  const ;
-
-        wxCoord DeviceToLogicalY(wxCoord y)  const ;
-
-        wxCoord DeviceToLogicalYRel(wxCoord y)  const ;
-
-        void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)
-            {  DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};
-
-        void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
-            {DoDrawIcon(icon, x, y) ; return ; };
+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);
+
+    virtual ~wxSVGFileDC();

 
 

-        void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
+    virtual bool CanDrawBitmap() const { return true; }
+    virtual bool CanGetTextExtent() const { return true; }

 
 

-        void EndDoc()
-            { return ; };
+    virtual int GetDepth() const
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented"));
+        return -1;
+    }

 
 

-        void EndDrawing()
-            { return ; };
+    virtual void Clear()
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?"));
+    }

 
 

-        void EndPage()
-            {  return ; };
+    virtual void DestroyClippingRegion()
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::void Call not yet implemented"));
+    }

 
 

-        void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)
-            { DoFloodFill (x, y, *colour, style); return ;} ;
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;

 
 

-        wxCoord GetCharHeight() const;
+    virtual void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxCoord WXUNUSED(w), wxCoord WXUNUSED(h))
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::SetClippingRegion not implemented"));
+    }

 
 

-        wxCoord GetCharWidth() const;
+    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"));
+    }

 
 

-        void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; };
+    virtual int GetLogicalFunction() const
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented"));
+        return -1;
+    }

 
 

-        int GetLogicalFunction()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction()  Call not implemented")); return wxCOPY ; };
+    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);

 
 

-        int GetMapMode() ;
+    virtual bool IsOk() const {return m_OK;}

 
 

-        bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
-            { return DoGetPixel (x, y, colour) ; } ;
+    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 );

 
 

-        void GetUserScale(double *x, double *y) const ;
+private:
+   virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented"));
+       return true;
+   }

 
 

-        wxCoord LogicalToDeviceX(wxCoord x)  const ;
+   virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
+                       wxCoord, wxCoord, int = wxCOPY,
+                       bool = 0, int = -1, int = -1);

 
 

-        wxCoord LogicalToDeviceXRel(wxCoord x)  const ;
+   virtual void DoCrossHair(wxCoord, wxCoord)
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented"));
+   }

 
 

-        wxCoord LogicalToDeviceY(wxCoord y)  const ;
+   virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);

 
 

-        wxCoord LogicalToDeviceYRel(wxCoord y)  const ;
+   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = 0);

 
 

-        bool Ok() const {return m_OK;};
+   virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

 
 

-        void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
+   virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

 
 

-        void SetClippingRegion(wxCoord  WXUNUSED(x), wxCoord  WXUNUSED(y), wxCoord  WXUNUSED(width), wxCoord  WXUNUSED(height))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };
+   virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                  double sa, double ea);

 
 

-        void SetPalette(const wxPalette&  WXUNUSED(palette))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };
+   virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord);

 
 

-        void SetBackground( const wxBrush &brush ) ;
+   virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);

 
 

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

 
 

-        void SetBrush(const wxBrush& brush) ;
+   virtual void DoDrawPoint(wxCoord, wxCoord);
+
+   virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle);

 
 

-        void SetFont(const wxFont& font) ;
+   virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+
+   virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+                                  double angle);

 
 

-        void SetLogicalFunction(int  WXUNUSED(function))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
+   virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                       wxCoord w, wxCoord h,
+                                       double radius = 20) ;

 
 

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

 
 

-        void SetLogicalOrigin( wxCoord x, wxCoord y ) ;
+   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 SetDeviceOrigin( wxCoord x, wxCoord y ) ;
+   virtual void DoGetSize(int * x, int *y) const
+   {
+       if ( x )
+           *x = m_width;
+       if ( y )
+           *y = m_height;
+   }

 
 

-        void SetMapMode(int anint) ;
+   virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h,
+                                wxCoord *descent = NULL,
+                                wxCoord *externalLeading = NULL,
+                                const wxFont *font = NULL) const;

 
 

-        void SetPen(const wxPen& pen)  ;
+   virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region))
+   {
+       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented"));
+   }

 
 

-        void SetUserScale(double xScale, double yScale) ;
+   void Init (wxString f, int Width, int Height, float dpi);

 
 

-        bool StartDoc(const wxString&  WXUNUSED(message))
-            {  return false; };
+   void NewGraphics();

 
 

-        void StartPage()
-            {  return ; };
+   void write( const wxString &s );

 
 

+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;

 
 

+private:
+   DECLARE_ABSTRACT_CLASS(wxSVGFileDC)

 };
 
 };
 

-#ifdef __BORLANDC__
-#pragma warn .rch
-#pragma warn .ccc
-#endif
-#endif
+#endif // wxUSE_SVG
+
+#endif // _WX_DCSVG_H_