X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/888dde65f43d5f57e8fb2028b27191cca1741403..916eabe60eee4adb05387bbf1eaf1915ae5eac18:/src/common/dcsvg.cpp?ds=sidebyside

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index ceefb7cfd7..2d0b4dcbab 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -55,10 +55,10 @@ wxString wxBrushString ( wxColour c, int style )
     wxString s = wxT("fill:#") + wxColStr (c)  + semicolon + space ;
     switch ( style )
     {
-        case wxSOLID :
+        case wxBRUSHSTYLE_SOLID :
             s = s + wxT("fill-opacity:1.0; ");
             break ;
-        case wxTRANSPARENT:
+        case wxBRUSHSTYLE_TRANSPARENT:
             s = s + wxT("fill-opacity:0.0; ");
             break ;
 
@@ -76,20 +76,12 @@ wxString wxBrushString ( wxColour c, int style )
 
 IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC)
 
-#if wxUSE_NEW_DC
-    wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, 
+wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, 
                      int width, int height, double dpi ) :
         wxDCImpl( 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 wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi)
 {
@@ -203,11 +195,7 @@ void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1)
 
 void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height)
 {
-#if wxUSE_NEW_DC
     wxDCImpl::DoDrawCheckMark (x1,y1,width,height) ;
-#else
-    wxDCBase::DoDrawCheckMark (x1,y1,width,height) ;
-#endif
 }
 
 
@@ -240,7 +228,7 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
     CalcBoundingBox(x, y);
     CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
 
-    if (m_backgroundMode == wxSOLID)
+    if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
     {
         // draw background first
         // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background
@@ -576,10 +564,10 @@ void wxSVGFileDCImpl::NewGraphics ()
 
     switch ( m_pen.GetStyle () )
     {
-        case  wxSOLID :
+        case  wxPENSTYLE_SOLID :
             sPenStyle = wxT("stroke-opacity:1.0; stroke-opacity:1.0; ") ;
             break ;
-        case  wxTRANSPARENT :
+        case  wxPENSTYLE_TRANSPARENT :
             sPenStyle = wxT("stroke-opacity:0.0; stroke-opacity:0.0; ") ;
             break ;
         default :
@@ -692,43 +680,6 @@ void wxSVGFileDCImpl::write(const wxString &s)
     m_OK = m_outfile->Ok();
 }
 
-// ---------------------------------------------------------------------------
-// coordinates transformations
-// ---------------------------------------------------------------------------
-
-#if wxUSE_NEW_DC
-#else
-void wxSVGFileDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp );
-}
-
-void wxSVGFileDCImpl::SetMapMode(int mode)
-{
-    wxDCBase::SetMapMode(mode);
-}
-
-void wxSVGFileDCImpl::SetUserScale(double x, double y)
-{
-    wxDCBase::SetUserScale(x,y);
-}
-
-void wxSVGFileDCImpl::SetLogicalScale(double x, double y)
-{
-    wxDCBase::SetLogicalScale(x,y);
-}
-
-void wxSVGFileDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)
-{
-    wxDCBase::SetLogicalOrigin(x,y);
-}
-
-void wxSVGFileDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)
-{
-    wxDCBase::SetDeviceOrigin(x,y);
-}
-#endif
-
 
 #ifdef __BORLANDC__
 #pragma warn .rch