Adapted to API changes with respect to GetTextExtent (patch #1709152).

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index ac14323287d239a3eb22a5a9eca227cf64718d4b..f700ffd07cf74df3aa689569653d52698d9f5dfb 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -17,6 +17,11 @@
 
 #define wxSVGVersion wxT("v0100")
 
 
 #define wxSVGVersion wxT("v0100")
 

+#ifdef __BORLANDC__
+#pragma warn -8008
+#pragma warn -8066
+#endif
+

 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 
 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 


@@ -86,7 +91,7 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 
         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  ; }


@@ -248,10 +253,10 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
         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 ; }
 
         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()
+        int GetLogicalFunction() const

             { 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() const ;

 
         bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
             { return DoGetPixel (x, y, colour) ; }
 
         bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
             { return DoGetPixel (x, y, colour) ; }


@@ -285,7 +290,7 @@ class WXDLLIMPEXP_CORE 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 not implemented")); return ; }

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