Halfway reasonable implementation of wxFont for wxCocoa.

[wxWidgets.git] / src / common / dcsvg.cpp

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 3369f14b01c1db469364fd05a8dab26f93515d80..063b017bfc08dd231ba64f88716d133584ee7128 100644 (file)
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -15,28 +15,27 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SVG
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcscreen.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"

 #endif
 #endif

- 
-#include "wx/svg/dcsvg.h"

 
 

-#include <math.h>
-#include "wx/image.h"
+#include "wx/dcsvg.h"
+#include "wx/wfstream.h"

 
 #define wxSVG_DEBUG FALSE
 // or TRUE to see the calls being executed
 
 #define wxSVG_DEBUG FALSE
 // or TRUE to see the calls being executed

-#define newline    wxString(wxT("\n"))
-#define space      wxString(wxT(" "))
-#define semicolon  wxString(wxT(";"))
-#define     wx_round(a)    (int)((a)+.5)

 
 

-#ifdef __BORLANDC__
-#pragma warn -rch
-#pragma warn -ccc
-#endif
+#define newline        wxString(wxT("\n"))
+#define space          wxString(wxT(" "))
+#define semicolon      wxString(wxT(";"))
+#define wx_round(a)    (int)((a)+.5)

 
 

-static inline double DegToRad(double deg) { return (deg * 3.14) / 180.0; } ;
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }

 
 wxString wxColStr ( wxColour c )
 {
 
 wxString wxColStr ( wxColour c )
 {


@@ -71,34 +70,39 @@ wxString wxBrushString ( wxColour c, int style )
     return s ;
 }
 
     return s ;
 }
 

+// ----------------------------------------------------------
+//   wxSVGFileDC
+// ----------------------------------------------------------

 
 

-void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
+IMPLEMENT_ABSTRACT_CLASS(wxSVGFileImplDC, wxDC)
+
+#if wxUSE_NEW_DC
+    wxSVGFileImplDC::wxSVGFileImplDC( wxSVGFileDC *owner, const wxString &filename, 
+                     int width, int height, double dpi ) :
+        wxImplDC( owner )
+    {
+        Init( filename, width, height, dpi ); 
+    }
+#else
+    wxSVGFileDC::wxSVGFileDC( const wxString &filename,
+                 int width, int height, double dpi )
+    { 
+        Init( filename, width, height, dpi ); 
+    }
+#endif

 
 

+void wxSVGFileImplDC::Init (const wxString &filename, int Width, int Height, double dpi)

 {
 {

-    //set up things first  wxDCBase does all this?

     m_width = Width ;
     m_height = Height ;
 
     m_width = Width ;
     m_height = Height ;
 

-    m_clipping = FALSE;
+    m_dpi = dpi;
+

     m_OK = TRUE;
 
     m_mm_to_pix_x = dpi/25.4;
     m_mm_to_pix_y = dpi/25.4;
 
     m_OK = TRUE;
 
     m_mm_to_pix_x = dpi/25.4;
     m_mm_to_pix_y = dpi/25.4;
 

-    m_signX = m_signY = 1;
-
-    m_userScaleX = m_userScaleY =
-        m_deviceOriginX = m_deviceOriginY = 0;
-
-    m_OriginX = m_OriginY = 0;
-    m_logicalOriginX = m_logicalOriginY = 0;
-    m_logicalScaleX = m_logicalScaleY = 0 ;
-    m_scaleX = m_scaleY = 1.0 ;
-
-    m_logicalFunction = wxCOPY;
-    m_backgroundMode = wxTRANSPARENT;
-    m_mappingMode = wxMM_TEXT;
-

     m_backgroundBrush = *wxTRANSPARENT_BRUSH;
     m_textForegroundColour = *wxBLACK;
     m_textBackgroundColour = *wxWHITE;
     m_backgroundBrush = *wxTRANSPARENT_BRUSH;
     m_textForegroundColour = *wxBLACK;
     m_textBackgroundColour = *wxWHITE;


@@ -112,11 +116,11 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
 
     ////////////////////code here
 
 
     ////////////////////code here
 

-    m_outfile = new wxFileOutputStream(f) ;
+    m_outfile = new wxFileOutputStream(filename) ;

     m_OK = m_outfile->Ok ();
     if (m_OK)
     {
     m_OK = m_outfile->Ok ();
     if (m_OK)
     {

-        m_filename = f ;
+        m_filename = filename ;

         m_sub_images = 0 ;
         wxString s ;
         s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>") ; s = s + newline ;
         m_sub_images = 0 ;
         wxString s ;
         s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>") ; s = s + newline ;


@@ -127,7 +131,7 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
         write(s);
         s.Printf ( wxT("<svg width=\"%.2gcm\" height=\"%.2gcm\" viewBox=\"0 0 %d %d \"> \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height );
         write(s);
         write(s);
         s.Printf ( wxT("<svg width=\"%.2gcm\" height=\"%.2gcm\" viewBox=\"0 0 %d %d \"> \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height );
         write(s);

-        s = wxT("<title>SVG Picture created as ") + wxFileNameFromPath(f) + wxT(" </title>") + newline ;
+        s = wxT("<title>SVG Picture created as ") + wxFileNameFromPath(filename) + wxT(" </title>") + newline ;

         write(s);
         s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>")+ newline ;
         write(s);
         write(s);
         s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>")+ newline ;
         write(s);


@@ -138,34 +142,29 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
 }
 
 
 }
 
 

-// constructors
-wxSVGFileDC::wxSVGFileDC (wxString f)
-{                                
-    // quarter 640x480 screen display at 72 dpi
-    Init (f,320,240,72.0);
-};
-
-wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height)
-{
-    Init (f,Width,Height,72.0);
-};
-
-wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height, float dpi)
-{
-    Init (f,Width,Height,dpi);
-};

 
 

-wxSVGFileDC::~wxSVGFileDC()
+wxSVGFileImplDC::~wxSVGFileImplDC()

 {
     wxString s = wxT("</g> \n</svg> \n") ;
     write(s);
     delete m_outfile ;
 }
 
 {
     wxString s = wxT("</g> \n</svg> \n") ;
     write(s);
     delete m_outfile ;
 }
 

+void wxSVGFileImplDC::DoGetSizeMM( int *width, int *height ) const
+{
+    if (width)
+        *width = wxRound( (double)m_width / m_mm_to_pix_x );
+        
+    if (height)
+        *height = wxRound( (double)m_height / m_mm_to_pix_y );
+}
+   
+wxSize wxSVGFileImplDC::GetPPI() const
+{
+    return wxSize( wxRound(m_dpi), wxRound(m_dpi) );
+}

 
 

-//////////////////////////////////////////////////////////////////////////////////////////
-
-void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxSVGFileImplDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
     if (m_graphics_changed) NewGraphics ();
     wxString s ;
 {
     if (m_graphics_changed) NewGraphics ();
     wxString s ;


@@ -178,9 +177,9 @@ void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     CalcBoundingBox(x1, y1) ;
     CalcBoundingBox(x2, y2) ;
     return;
     CalcBoundingBox(x1, y1) ;
     CalcBoundingBox(x2, y2) ;
     return;

-};
+}

 
 

-void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset )
+void wxSVGFileImplDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset )

 {
     for ( int i = 1; i < n ; i++ )
     {
 {
     for ( int i = 1; i < n ; i++ )
     {


@@ -190,32 +189,36 @@ void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord
 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawPoint (wxCoord x1, wxCoord y1)
+void wxSVGFileImplDC::DoDrawPoint (wxCoord x1, wxCoord y1)

 {
     wxString s;
     if (m_graphics_changed) NewGraphics ();
     s = wxT("<g style = \"stroke-linecap:round;\" > ") + newline ;
     write(s);
 {
     wxString s;
     if (m_graphics_changed) NewGraphics ();
     s = wxT("<g style = \"stroke-linecap:round;\" > ") + newline ;
     write(s);

-    DrawLine ( x1,y1,x1,y1 );
+    DoDrawLine ( x1,y1,x1,y1 );

     s = wxT("</g>");
     write(s);
 }
 
 
     s = wxT("</g>");
     write(s);
 }
 
 

-void wxSVGFileDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height)
+void wxSVGFileImplDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height)

 {
 {

+#if wxUSE_NEW_DC
+    wxImplDC::DoDrawCheckMark (x1,y1,width,height) ;
+#else

     wxDCBase::DoDrawCheckMark (x1,y1,width,height) ;
     wxDCBase::DoDrawCheckMark (x1,y1,width,height) ;

+#endif

 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1)
+void wxSVGFileImplDC::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1)

 {
     DoDrawRotatedText(text, x1,y1,0.0);
     wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawText Call executed")) ;
 }
 
 
 {
     DoDrawRotatedText(text, x1,y1,0.0);
     wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawText Call executed")) ;
 }
 
 

-void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle)
+void wxSVGFileImplDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle)

 {
     //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW
     if (m_graphics_changed) NewGraphics ();
 {
     //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW
     if (m_graphics_changed) NewGraphics ();


@@ -252,17 +255,17 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
     }
     //now do the text itself
     s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );
     }
     //now do the text itself
     s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );

-   
+

     sTmp = m_font.GetFaceName () ;
     if (sTmp.Len () > 0)  s = s + wxT("style=\"font-family:") + sTmp + wxT("; ");
     else s = s + wxT("style=\" ") ;
 
     wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") };
     s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space;
     sTmp = m_font.GetFaceName () ;
     if (sTmp.Len () > 0)  s = s + wxT("style=\"font-family:") + sTmp + wxT("; ");
     else s = s + wxT("style=\" ") ;
 
     wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") };
     s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space;

-    
+

     wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") };
     s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon  + space;
     wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") };
     s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon  + space;

-    
+

     sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () );
     s = s + sTmp ;
     s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ;
     sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () );
     s = s + sTmp ;
     s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ;


@@ -277,19 +280,19 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxSVGFileImplDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     DoDrawRoundedRectangle(x, y, width, height, 0)  ;
 }
 
 
 {
     DoDrawRoundedRectangle(x, y, width, height, 0)  ;
 }
 
 

-void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
+void wxSVGFileImplDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )

 
 {
     if (m_graphics_changed) NewGraphics ();
     wxString s ;
 
 
 {
     if (m_graphics_changed) NewGraphics ();
     wxString s ;
 

-    s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "), 
+    s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "),

                x, y, width, height, radius );
 
     s = s + wxT(" /> ") + newline ;
                x, y, width, height, radius );
 
     s = s + wxT(" /> ") + newline ;


@@ -302,7 +305,7 @@ void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
+void wxSVGFileImplDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)

 {
     if (m_graphics_changed) NewGraphics ();
     wxString s, sTmp ;
 {
     if (m_graphics_changed) NewGraphics ();
     wxString s, sTmp ;


@@ -328,7 +331,7 @@ void wxSVGFileDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoor
 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxSVGFileImplDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 
 {
     if (m_graphics_changed) NewGraphics ();
 
 {
     if (m_graphics_changed) NewGraphics ();


@@ -348,7 +351,7 @@ void wxSVGFileDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord he
 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
+void wxSVGFileImplDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)

 {
     /* Draws an arc of a circle, centred on (xc, yc), with starting point
     (x1, y1) and ending at (x2, y2). The current pen is used for the outline
 {
     /* Draws an arc of a circle, centred on (xc, yc), with starting point
     (x1, y1) and ending at (x2, y2). The current pen is used for the outline


@@ -373,14 +376,14 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo
         write(s);
     }
 
         write(s);
     }
 

-    double theta1 = atan2(yc-y1,x1-xc);
-    if ( theta1 < 0 ) theta1 = theta1 + 3.14 * 2;
-    double theta2 = atan2(yc-y2, x2-xc);
-    if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2;
-    if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ;
+    double theta1 = atan2((double)(yc-y1),(double)(x1-xc));
+    if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2;
+    double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
+    if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
+    if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2 ;

 
     int fArc  ;                  // flag for large or small arc 0 means less than 180 degrees
 
     int fArc  ;                  // flag for large or small arc 0 means less than 180 degrees

-    if (  fabs((theta2 - theta1) > 3.14 )) fArc = 1; else fArc = 0 ;
+    if ( fabs(theta2 - theta1) > M_PI ) fArc = 1; else fArc = 0 ;

 
     int fSweep = 0 ;             // flag for sweep always 0
 
 
     int fSweep = 0 ;             // flag for sweep always 0
 


@@ -400,7 +403,7 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo
 }
 
 
 }
 
 

-void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxSVGFileImplDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
     /*
     Draws an arc of an ellipse. The current pen is used for drawing the arc
 {
     /*
     Draws an arc of an ellipse. The current pen is used for drawing the arc


@@ -446,7 +449,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
     if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
 
     int fSweep ;
     if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
 
     int fSweep ;

-    if ( fabs( (theta2 - theta1) > 3.14)) fSweep = 1; else fSweep = 0 ;
+    if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0 ;

 
     s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d  %d %d L %d %d z "),
         int(xs), int(ys), int(rx), int(ry),
 
     s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d  %d %d L %d %d z "),
         int(xs), int(ys), int(rx), int(ry),


@@ -464,7 +467,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
 }
 
 
 }
 
 

-void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , wxFont *font) const
+void wxSVGFileImplDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const

 
 {
     wxScreenDC sDC ;
 
 {
     wxScreenDC sDC ;


@@ -476,7 +479,7 @@ void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h
 }
 
 
 }
 
 

-wxCoord wxSVGFileDC::GetCharHeight() const
+wxCoord wxSVGFileImplDC::GetCharHeight() const

 
 {
     wxScreenDC sDC ;
 
 {
     wxScreenDC sDC ;


@@ -488,7 +491,7 @@ wxCoord wxSVGFileDC::GetCharHeight() const
 }
 
 
 }
 
 

-wxCoord wxSVGFileDC::GetCharWidth() const
+wxCoord wxSVGFileImplDC::GetCharWidth() const

 {
     wxScreenDC sDC ;
     sDC.SetFont (m_font);
 {
     wxScreenDC sDC ;
     sDC.SetFont (m_font);


@@ -500,7 +503,7 @@ wxCoord wxSVGFileDC::GetCharWidth() const
 
 
 /// Set Functions /////////////////////////////////////////////////////////////////
 
 
 /// Set Functions /////////////////////////////////////////////////////////////////

-void wxSVGFileDC::SetBackground( const wxBrush &brush )
+void wxSVGFileImplDC::SetBackground( const wxBrush &brush )

 {
 
     m_backgroundBrush = brush;
 {
 
     m_backgroundBrush = brush;


@@ -508,14 +511,14 @@ void wxSVGFileDC::SetBackground( const wxBrush &brush )
 }
 
 
 }
 
 

-void wxSVGFileDC::SetBackgroundMode( int mode )
+void wxSVGFileImplDC::SetBackgroundMode( int mode )

 {
     m_backgroundMode = mode;
     return;
 }
 
 
 {
     m_backgroundMode = mode;
     return;
 }
 
 

-void wxSVGFileDC::SetBrush(const wxBrush& brush)
+void wxSVGFileImplDC::SetBrush(const wxBrush& brush)

 
 {
     m_brush = brush ;
 
 {
     m_brush = brush ;


@@ -525,27 +528,27 @@ void wxSVGFileDC::SetBrush(const wxBrush& brush)
 }
 
 
 }
 
 

-void wxSVGFileDC::SetPen(const wxPen& pen)
+void wxSVGFileImplDC::SetPen(const wxPen& pen)

 {
     // width, color, ends, joins : currently implemented
     // dashes, stipple :  not implemented
     m_pen = pen ;
 {
     // width, color, ends, joins : currently implemented
     // dashes, stipple :  not implemented
     m_pen = pen ;

-  
+

     m_graphics_changed = TRUE ;
     wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ;
 }
 
     m_graphics_changed = TRUE ;
     wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ;
 }
 

-void wxSVGFileDC::NewGraphics ()
+void wxSVGFileImplDC::NewGraphics ()

 {
 
     int w = m_pen.GetWidth ();
     wxColour c = m_pen.GetColour () ;
 
     wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
 {
 
     int w = m_pen.GetWidth ();
     wxColour c = m_pen.GetColour () ;
 
     wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;

-       
-    sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () ) 
-       + wxT("  stroke:#") + wxColStr (c) + wxT("; ") ;
-       
+
+    sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () )
+             + wxT("  stroke:#") + wxColStr (c) + wxT("; ") ;
+

     switch ( m_pen.GetCap () )
     {
         case  wxCAP_PROJECTING :
     switch ( m_pen.GetCap () )
     {
         case  wxCAP_PROJECTING :


@@ -584,8 +587,8 @@ void wxSVGFileDC::NewGraphics ()
             sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ;
     }
 
             sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ;
     }
 

-    sLast.Printf (   wxT("stroke-width:%d\" \n   transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"),  
-                  w, m_OriginX, m_OriginY, m_scaleX, m_scaleY  );
+    sLast.Printf( wxT("stroke-width:%d\" \n   transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"),
+                  w, (double)m_logicalOriginX, m_logicalOriginY, m_scaleX, m_scaleY  );

 
     s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn;
     write(s);
 
     s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn;
     write(s);


@@ -594,123 +597,21 @@ void wxSVGFileDC::NewGraphics ()
 }
 
 
 }
 
 

-void wxSVGFileDC::SetFont(const wxFont& font)
+void wxSVGFileImplDC::SetFont(const wxFont& font)

 
 {
     m_font = font ;
 
 {
     m_font = font ;

-    
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ;
-}
-
-
-void wxSVGFileDC::ComputeScaleAndOrigin()
-{
-    m_scaleX = m_logicalScaleX * m_userScaleX;
-    m_scaleY = m_logicalScaleY * m_userScaleY;
-    m_OriginX = m_logicalOriginX * m_logicalScaleX + m_deviceOriginX ;
-    m_OriginY = m_logicalOriginY * m_logicalScaleY + m_deviceOriginY ;
-    m_graphics_changed = TRUE;
-}
-
-
-int wxSVGFileDC::GetMapMode()
-{
-    return m_mappingMode ;
-}
-
-
-void wxSVGFileDC::SetMapMode( int mode )
-{
-    switch (mode)
-    {
-        case wxMM_TWIPS:
-            SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
-            break;
-        case wxMM_POINTS:
-            SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
-            break;
-        case wxMM_METRIC:
-            SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
-            break;
-        case wxMM_LOMETRIC:
-            SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
-            break;
-        default:
-        case wxMM_TEXT:
-            SetLogicalScale( 1.0, 1.0 );
-            break;
-    }
-    m_mappingMode = mode;
-
-    /*  we don't do this mega optimisation
-        if (mode != wxMM_TEXT)
-        {
-            m_needComputeScaleX = TRUE;
-            m_needComputeScaleY = TRUE;
-        }
-    */
-}
-
-
-void wxSVGFileDC::GetUserScale(double *x, double *y) const
-{
-    *x = m_userScaleX ;
-    *y = m_userScaleY ;
-}
-
-
-void wxSVGFileDC::SetUserScale( double x, double y )
-{
-    // allow negative ? -> no
-    m_userScaleX = x;
-    m_userScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetLogicalScale( double x, double y )
-{
-    // allow negative ?
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
-    // is this still correct ?
-    m_logicalOriginX = x * m_signX;
-    m_logicalOriginY = y * m_signY;
-    ComputeScaleAndOrigin();
-}
-

 
 

-void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
-    // only wxPostScripDC has m_signX = -1, 
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    // only wxPostScripDC has m_signX = -1, 
-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp  ? -1 :  1);
-    ComputeScaleAndOrigin();
+    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ;

 }
 
 
 // export a bitmap as a raster image in png
 }
 
 
 // export a bitmap as a raster image in png

-bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                         wxDC* source, wxCoord xsrc, wxCoord ysrc, 
-                        int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
-                        wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
+bool wxSVGFileImplDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+                         wxDC* source, wxCoord xsrc, wxCoord ysrc,
+                         int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
+                         wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)

 {
 {

-    

     if (logicalFunc != wxCOPY)
     {
         wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;
     if (logicalFunc != wxCOPY)
     {
         wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;


@@ -731,8 +632,7 @@ bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
     return FALSE ;
 }
 
     return FALSE ;
 }
 

-
-void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)
+void wxSVGFileImplDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)

 {
     wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ) ;
     wxMemoryDC memDC;
 {
     wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ) ;
     wxMemoryDC memDC;


@@ -744,16 +644,14 @@ void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)
     return ;
 }
 
     return ;
 }
 

-
-                                 
-void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool  WXUNUSED(bTransparent) /*=0*/ )
+void wxSVGFileImplDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool  WXUNUSED(bTransparent) /*=0*/ )

 {
     if (m_graphics_changed) NewGraphics ();
 
 {
     if (m_graphics_changed) NewGraphics ();
 

-    wxString sTmp, s, sPNG ; 
+    wxString sTmp, s, sPNG ;

     wxImage::AddHandler(new wxPNGHandler);
 
     wxImage::AddHandler(new wxPNGHandler);
 

-// create suitable file name   
+// create suitable file name

     sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
     sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
     while (wxFile::Exists(sPNG) )
     sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
     sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
     while (wxFile::Exists(sPNG) )


@@ -762,7 +660,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
         sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
         sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
     }
         sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
         sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
     }

-    
+

 //create copy of bitmap (wxGTK doesn't like saving a constant bitmap)
     wxBitmap myBitmap = bmp ;
 //save it
 //create copy of bitmap (wxGTK doesn't like saving a constant bitmap)
     wxBitmap myBitmap = bmp ;
 //save it


@@ -775,7 +673,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
     s = s + sTmp ;
     sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
     s = s + sTmp + wxT("<title>Image from wxSVG</title>  </image>") + newline;
     s = s + sTmp ;
     sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
     s = s + sTmp + wxT("<title>Image from wxSVG</title>  </image>") + newline;

-    
+

     if (m_OK && bPNG_OK)
     {
         write(s);
     if (m_OK && bPNG_OK)
     {
         write(s);


@@ -786,66 +684,55 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
     return  ;
 }
 
     return  ;
 }
 

+void wxSVGFileImplDC::write(const wxString &s)
+{
+    const wxCharBuffer buf = s.utf8_str();
+    m_outfile->Write(buf, strlen((const char *)buf));
+    m_OK = m_outfile->Ok();
+}

 
 // ---------------------------------------------------------------------------
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // coordinates transformations
 // ---------------------------------------------------------------------------
 

-wxCoord wxSVGFileDC::DeviceToLogicalX(wxCoord x) const
-{
-    return XDEV2LOG(x);
-}
-
-
-wxCoord wxSVGFileDC::DeviceToLogicalY(wxCoord y) const
-{
-    return YDEV2LOG(y);
-}
-
-
-wxCoord wxSVGFileDC::DeviceToLogicalXRel(wxCoord x) const
+#if wxUSE_NEW_DC
+#else
+void wxSVGFileImplDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )

 {
 {

-    return XDEV2LOGREL(x);
+    wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp );

 }
 
 }
 

-
-wxCoord wxSVGFileDC::DeviceToLogicalYRel(wxCoord y) const
+void wxSVGFileImplDC::SetMapMode(int mode)

 {
 {

-    return YDEV2LOGREL(y);
+    wxDCBase::SetMapMode(mode);

 }
 
 }
 

-
-wxCoord wxSVGFileDC::LogicalToDeviceX(wxCoord x) const
+void wxSVGFileImplDC::SetUserScale(double x, double y)

 {
 {

-    return XLOG2DEV(x);
+    wxDCBase::SetUserScale(x,y);

 }
 
 }
 

-
-wxCoord wxSVGFileDC::LogicalToDeviceY(wxCoord y) const
+void wxSVGFileImplDC::SetLogicalScale(double x, double y)

 {
 {

-    return YLOG2DEV(y);
+    wxDCBase::SetLogicalScale(x,y);

 }
 
 }
 

-
-wxCoord wxSVGFileDC::LogicalToDeviceXRel(wxCoord x) const
+void wxSVGFileImplDC::SetLogicalOrigin(wxCoord x, wxCoord y)

 {
 {

-    return XLOG2DEVREL(x);
+    wxDCBase::SetLogicalOrigin(x,y);

 }
 
 }
 

-
-wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const
+void wxSVGFileImplDC::SetDeviceOrigin(wxCoord x, wxCoord y)

 {
 {

-    return YLOG2DEVREL(y);
+    wxDCBase::SetDeviceOrigin(x,y);

 }
 }

+#endif

 
 

-void wxSVGFileDC::write(const wxString &s)
-{
-       const wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
-       m_outfile->Write(buf, strlen((const char *)buf));
-       m_OK = m_outfile->Ok();
-}

 
 #ifdef __BORLANDC__
 #pragma warn .rch
 #pragma warn .ccc
 #endif
 
 #ifdef __BORLANDC__
 #pragma warn .rch
 #pragma warn .ccc
 #endif

+
+#endif // wxUSE_SVG
+