compilation fixes after last commit

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index e6e19364daf76e41306eb1a6d1c7385a9333e596..8808122b8c711095fac557399c295ba5df873cfe 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -1,34 +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>
-
-#ifdef WXMAKINGDLL_SVG
-    #define WXDLLIMPEXP_SVG WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_SVG WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_SVG
-#endif
-
-#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 WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
+class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC

 {
 
     private:
 {
 
     private:


@@ -315,12 +304,6 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
 
         void StartPage()
             {  return ; };
 
         void StartPage()
             {  return ; };

-
-

 };
 
 };
 

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