added conversion to and from std::string and std::wstring (if wxUSE_STD_STRING)

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 289f1eaccbef2dd32f528359b30bc711469c4420..ac14323287d239a3eb22a5a9eca227cf64718d4b 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -1,26 +1,23 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcsvg.h
+// Purpose:     wxSVGFileDC
+// Author:      Chris Elliott
+// Modified by:
+// Created:
+// Copyright:   (c) Chris Elliott
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef __DCSVG_H
 #define __DCSVG_H
 #ifndef __DCSVG_H
 #define __DCSVG_H

-#include <wx/wfstream.h>
-#include <wx/string.h>
-
-#define wxSVGVersion wxT("v0100")
-#ifdef __BORLANDC__
-#pragma warn -rch
-#pragma warn -ccc
-#endif

 
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
+#include "wx/wfstream.h"
+#include "wx/string.h"

 
 

-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
+#define wxSVGVersion wxT("v0100")

 
 

-class wxSVGFileDC : public wxDC
+class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC

 {
 
     private:
 {
 
     private:


@@ -30,32 +27,32 @@ class wxSVGFileDC : public wxDC
         int m_sub_images ;
         bool m_OK, m_graphics_changed ;
         int m_width, m_height ;
         int m_sub_images ;
         bool m_OK, m_graphics_changed ;
         int m_width, m_height ;

- 
-        double       
+
+        double

             m_logicalScaleX,
             m_logicalScaleY,
             m_userScaleX,
             m_userScaleY,
             m_scaleX,
             m_scaleY,
             m_logicalScaleX,
             m_logicalScaleY,
             m_userScaleX,
             m_userScaleY,
             m_scaleX,
             m_scaleY,

-           m_OriginX,  
+            m_OriginX,

             m_OriginY,
             m_mm_to_pix_x,
             m_mm_to_pix_y;
 
             m_OriginY,
             m_mm_to_pix_x,
             m_mm_to_pix_y;
 

-        bool         
-               m_needComputeScaleX,
+        bool
+            m_needComputeScaleX,

             m_needComputeScaleY; // not yet used
             m_needComputeScaleY; // not yet used

-            

 
 

-        bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const 
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return TRUE ; };
+
+        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) ;
 
 
         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 DoCrossHair(wxCoord, wxCoord)
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return  ; }

 
         void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
 
 
         void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
 


@@ -85,14 +82,14 @@ class wxSVGFileDC : public wxDC
 
         bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col),
                              int WXUNUSED(style) = wxFLOOD_SURFACE)
 
         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 ; };
+            { 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 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 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 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 Init (wxString f, int Width, int Height, float dpi);
 


@@ -183,6 +180,7 @@ class wxSVGFileDC : public wxDC
                 return (wxCoord)((double)(y) * m_scaleY - 0.5);
         }
 
                 return (wxCoord)((double)(y) * m_scaleY - 0.5);
         }
 

+        void write(const wxString &s);

 
     public:
 
 
     public:
 


@@ -192,28 +190,28 @@ class wxSVGFileDC : public wxDC
         ~wxSVGFileDC();
 
 
         ~wxSVGFileDC();
 
 

-        bool CanDrawBitmap() const { return TRUE ; };
+        bool CanDrawBitmap() const { return true; }

 
 

-        bool CanGetTextExtent() const { return TRUE ; };
+        bool CanGetTextExtent() const { return true; }

 
         int GetDepth() const
 
         int GetDepth() const

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };
- 
-        void BeginDrawing() { return;};
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; }

 
 

-        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 BeginDrawing() { return;}
+
+        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()
 
         void Clear()

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; }

 
         void CrossHair(wxCoord x, wxCoord y)
 
         void CrossHair(wxCoord x, wxCoord y)

-            { DoCrossHair (x,y); return; };
+            { DoCrossHair (x,y); return; }

 
 

-        void ComputeScaleAndOrigin() ;
+        virtual void ComputeScaleAndOrigin();

 
         void DestroyClippingRegion()
 
         void DestroyClippingRegion()

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; }

 
         wxCoord DeviceToLogicalX(wxCoord x) const ;
 
 
         wxCoord DeviceToLogicalX(wxCoord x) const ;
 


@@ -224,43 +222,39 @@ class wxSVGFileDC : public wxDC
         wxCoord DeviceToLogicalYRel(wxCoord y)  const ;
 
         void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)
         wxCoord DeviceToLogicalYRel(wxCoord y)  const ;
 
         void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)

-            {  DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};
+            {  DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;}

 
 

- 

         void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
         void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)

-            {DoDrawIcon(icon, x, y) ; return ; };
+            {DoDrawIcon(icon, x, y) ; return ; }

 
         void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
 
         void EndDoc()
 
         void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
 
         void EndDoc()

-            { return ; };
+            { return ; }

 
         void EndDrawing()
 
         void EndDrawing()

-            { return ; };
+            { return ; }

 
         void EndPage()
 
         void EndPage()

-            {  return ; };
+            {  return ; }

 
         void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)
 
         void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)

-            { DoFloodFill (x, y, *colour, style); return ;} ;
+            { DoFloodFill (x, y, *colour, style); return ;}

 
         wxCoord GetCharHeight() const;
 
         wxCoord GetCharWidth() const;
 
         void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))
 
         wxCoord GetCharHeight() const;
 
         wxCoord GetCharWidth() const;
 
         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 ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; }

 
         int GetLogicalFunction()
 
         int GetLogicalFunction()

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetLogicalFunction()  Call not implemented")); return wxCOPY ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction()  Call not implemented")); return wxCOPY ; }

 
         int GetMapMode() ;
 
 
         int GetMapMode() ;
 

-        bool GetOptimization()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetOptimization()  No optimization code used")); return TRUE ; };
-

         bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
         bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)

-            { return DoGetPixel (x, y, colour) ; } ;
+            { return DoGetPixel (x, y, colour) ; }

 
         void GetUserScale(double *x, double *y) const ;
 
 
         void GetUserScale(double *x, double *y) const ;
 


@@ -272,15 +266,15 @@ class wxSVGFileDC : public wxDC
 
         wxCoord LogicalToDeviceYRel(wxCoord y)  const ;
 
 
         wxCoord LogicalToDeviceYRel(wxCoord y)  const ;
 

-        bool Ok() const {return m_OK;};
+        bool Ok() const {return m_OK;}

 
         void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
 
         void SetClippingRegion(wxCoord  WXUNUSED(x), wxCoord  WXUNUSED(y), wxCoord  WXUNUSED(width), wxCoord  WXUNUSED(height))
 
         void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
 
         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 ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; }

 
         void SetPalette(const wxPalette&  WXUNUSED(palette))
 
         void SetPalette(const wxPalette&  WXUNUSED(palette))

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; }

 
         void SetBackground( const wxBrush &brush ) ;
 
 
         void SetBackground( const wxBrush &brush ) ;
 


@@ -291,7 +285,7 @@ class wxSVGFileDC : public wxDC
         void SetFont(const wxFont& font) ;
 
         void SetLogicalFunction(int  WXUNUSED(function))
         void SetFont(const wxFont& font) ;
 
         void SetLogicalFunction(int  WXUNUSED(function))

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; }

 
         void SetLogicalScale( double x, double y ) ;
 
 
         void SetLogicalScale( double x, double y ) ;
 


@@ -301,23 +295,15 @@ class wxSVGFileDC : public wxDC
 
         void SetMapMode(int anint) ;
 
 
         void SetMapMode(int anint) ;
 

-        void SetOptimization(bool  WXUNUSED(optimize)) { return ; };
-

         void SetPen(const wxPen& pen)  ;
 
         void SetUserScale(double xScale, double yScale) ;
 
         bool StartDoc(const wxString&  WXUNUSED(message))
         void SetPen(const wxPen& pen)  ;
 
         void SetUserScale(double xScale, double yScale) ;
 
         bool StartDoc(const wxString&  WXUNUSED(message))

-            {  return FALSE; };
+            {  return false; }

 
         void StartPage()
 
         void StartPage()

-            {  return ; };
-
-
+            {  return ; }

 };
 
 };
 

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