dont use wxChar* arguments in wxHTML API

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index fefeea50843e3d93683e1f438bd8d8604dbf3a56..a14a1ee31cf2612895d7ce734ca0f1f05556b427 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -1,69 +1,93 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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>
-
-#ifdef WXMAKINGDLL_SVG
-    #define WXDLLIMPEXP_SVG WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_SVG WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_SVG
-#endif
+
+#include "wx/wfstream.h"
+#include "wx/string.h"

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

+

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma warn -rch
-#pragma warn -ccc
+#pragma warn -8008
+#pragma warn -8066

 #endif
 
 #endif
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
+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();

 
 

-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
+    bool CanDrawBitmap() const { return true; }
+    bool CanGetTextExtent() const { return true; }

 
 

-class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
-{
+    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 ; }
+
+    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 ; }

 
 

-    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 ; };
+    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;}
+
+    // these need to be overridden as wxPostscriptDC inherits
+    // from the platform dependent wxDC and this we'd call
+    // e.g. wxMSW specific code here.
+    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 );
+    void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
+
+private:
+        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);
 


@@ -79,6 +103,8 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
 
         void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ;
 
 
         void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ;
 

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

         void DoDrawPoint(wxCoord, wxCoord) ;
 
         void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ;
         void DoDrawPoint(wxCoord, wxCoord) ;
 
         void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ;


@@ -93,240 +119,31 @@ class WXDLLIMPEXP_SVG 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, const 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);
 

-       void NewGraphics () ;
-
-#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
-#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;};
-
-        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; };
-
-        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 ; };
-
-        void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
-
-        void EndDoc()
-            { return ; };
-
-        void EndDrawing()
-            { return ; };
-
-        void EndPage()
-            {  return ; };
-
-        void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)
-            { 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))
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; };
-
-        int GetLogicalFunction()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetLogicalFunction()  Call not implemented")); return wxCOPY ; };
-
-        int GetMapMode() ;
-
-        bool GetOptimization()
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetOptimization()  No optimization code used")); return TRUE ; };
-
-        bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
-            { return DoGetPixel (x, y, colour) ; } ;
-
-        void GetUserScale(double *x, double *y) const ;
-
-        wxCoord LogicalToDeviceX(wxCoord x)  const ;
-
-        wxCoord LogicalToDeviceXRel(wxCoord x)  const ;
-
-        wxCoord LogicalToDeviceY(wxCoord y)  const ;
-
-        wxCoord LogicalToDeviceYRel(wxCoord y)  const ;
-
-        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))
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };
-
-        void SetPalette(const wxPalette&  WXUNUSED(palette))
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };
-
-        void SetBackground( const wxBrush &brush ) ;
-
-        void SetBackgroundMode( int mode ) ;
-
-        void SetBrush(const wxBrush& brush) ;
-
-        void SetFont(const wxFont& font) ;
-
-        void SetLogicalFunction(int  WXUNUSED(function))
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
-
-        void SetLogicalScale( double x, double y ) ;
-
-        void SetLogicalOrigin( wxCoord x, wxCoord y ) ;
-
-        void SetDeviceOrigin( wxCoord x, wxCoord y ) ;
-
-        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))
-            {  return FALSE; };
-
-        void StartPage()
-            {  return ; };
-
-
+       void NewGraphics();
+       
+       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      // __DCSVG_H