added macros to avoid code repetition when defining comparison operators; use them...

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 12e18db630a95692118e33f703a24cb370ca9116..9e9b8c7b0f8a24f6de8f1ff6332b00ff8e5fc4af 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -1,7 +1,15 @@
 #ifndef __DCSVG_H
 #define __DCSVG_H
 #ifndef __DCSVG_H
 #define __DCSVG_H

-#include <wx/wfstream.h>
-#include <wx/string.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__
 
 #define wxSVGVersion wxT("v0100")
 #ifdef __BORLANDC__


@@ -9,18 +17,7 @@
 #pragma warn -ccc
 #endif
 
 #pragma warn -ccc
 #endif
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
-
-class wxSVGFileDC : public wxDC
+class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC

 {
 
     private:
 {
 
     private:


@@ -30,32 +27,32 @@ class wxSVGFileDC : public wxDC
         int m_sub_images ;
         bool m_OK, m_graphics_changed ;
         int m_width, m_height ;
         int m_sub_images ;
         bool m_OK, m_graphics_changed ;
         int m_width, m_height ;

- 
-        double       
+
+        double

             m_logicalScaleX,
             m_logicalScaleY,
             m_userScaleX,
             m_userScaleY,
             m_scaleX,
             m_scaleY,
             m_logicalScaleX,
             m_logicalScaleY,
             m_userScaleX,
             m_userScaleY,
             m_scaleX,
             m_scaleY,

-           m_OriginX,  
+            m_OriginX,

             m_OriginY,
             m_mm_to_pix_x,
             m_mm_to_pix_y;
 
             m_OriginY,
             m_mm_to_pix_x,
             m_mm_to_pix_y;
 

-        bool         
-               m_needComputeScaleX,
+        bool
+            m_needComputeScaleX,

             m_needComputeScaleY; // not yet used
             m_needComputeScaleY; // not yet used

-            

 
 

-        bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const 
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return TRUE ; };
+
+        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);
 


@@ -83,16 +80,16 @@ class wxSVGFileDC : public wxDC
 
         void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
 
 
         void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
 

-        bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             int style = wxFLOOD_SURFACE)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return FALSE ; };
+        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 ; };

 
         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 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 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);
 


@@ -183,6 +180,7 @@ class wxSVGFileDC : public wxDC
                 return (wxCoord)((double)(y) * m_scaleY - 0.5);
         }
 
                 return (wxCoord)((double)(y) * m_scaleY - 0.5);
         }
 

+        void write(const wxString &s);

 
     public:
 
 
     public:
 


@@ -192,28 +190,28 @@ class wxSVGFileDC : public wxDC
         ~wxSVGFileDC();
 
 
         ~wxSVGFileDC();
 
 

-        bool CanDrawBitmap() const { return TRUE ; };
+        bool CanDrawBitmap() const { return true; };

 
 

-        bool CanGetTextExtent() const { return TRUE ; };
+        bool CanGetTextExtent() const { return true; };

 
         int GetDepth() const
 
         int GetDepth() const

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };
- 
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };
+

         void BeginDrawing() { return;};
 
         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)
+        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()
             { 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 ; };
+            { 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 CrossHair(wxCoord x, wxCoord y)
             { DoCrossHair (x,y); return; };
 

-        void ComputeScaleAndOrigin() ;
+        virtual void ComputeScaleAndOrigin();

 
         void DestroyClippingRegion()
 
         void DestroyClippingRegion()

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };

 
         wxCoord DeviceToLogicalX(wxCoord x) const ;
 
 
         wxCoord DeviceToLogicalX(wxCoord x) const ;
 


@@ -226,7 +224,6 @@ class wxSVGFileDC : public wxDC
         void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)
             {  DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};
 
         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 DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
             {DoDrawIcon(icon, x, y) ; return ; };
 


@@ -248,17 +245,14 @@ class wxSVGFileDC : public wxDC
 
         wxCoord GetCharWidth() const;
 
 
         wxCoord GetCharWidth() const;
 

-        void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *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()

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

-        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) ; } ;
 
         bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
             { return DoGetPixel (x, y, colour) ; } ;
 


@@ -276,11 +270,11 @@ class wxSVGFileDC : public wxDC
 
         void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
 
 
         void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
 

-        void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };
+        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& palette)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetPalette 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 SetBackground( const wxBrush &brush ) ;
 


@@ -290,8 +284,8 @@ class wxSVGFileDC : public wxDC
 
         void SetFont(const wxFont& font) ;
 
 
         void SetFont(const wxFont& font) ;
 

-        void SetLogicalFunction(int function)
-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
+        void SetLogicalFunction(int  WXUNUSED(function))
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };

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


@@ -301,14 +295,12 @@ class wxSVGFileDC : public wxDC
 
         void SetMapMode(int anint) ;
 
 
         void SetMapMode(int anint) ;
 

-        void SetOptimization(bool optimize) { return ; };
-

         void SetPen(const wxPen& pen)  ;
 
         void SetUserScale(double xScale, double yScale) ;
 
         void SetPen(const wxPen& pen)  ;
 
         void SetUserScale(double xScale, double yScale) ;
 

-        bool StartDoc(const wxString& message)
-            {  return FALSE; };
+        bool StartDoc(const wxString&  WXUNUSED(message))
+            {  return false; };

 
         void StartPage()
             {  return ; };
 
         void StartPage()
             {  return ; };