corrected WX_DEFINE_VARARG_FUNC_NOP usage

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

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 0cae7be4a88d2898a2367a82ee9d192a6210badf..9e9b8c7b0f8a24f6de8f1ff6332b00ff8e5fc4af 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -1,7 +1,7 @@
 #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
 
 #ifdef WXMAKINGDLL_SVG
     #define WXDLLIMPEXP_SVG WXEXPORT


@@ -17,17 +17,6 @@
 #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 WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
 {
 
 class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
 {
 


@@ -57,13 +46,13 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
 
 
         bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const
 
 
         bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const

-            { wxASSERT_MSG (FALSE, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; };
+            { 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) ;
 
         void DoCrossHair(wxCoord, wxCoord)
 
         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  ; };
+            { 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);
 


@@ -93,14 +82,14 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
 
         bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col),
                              int WXUNUSED(style) = wxFLOOD_SURFACE)
 
         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 ; };
+            { 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 DoSetClippingRegionAsRegion(const class wxRegion &)
 
         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  ; };
+            { 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);
 


@@ -206,23 +195,23 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
         bool CanGetTextExtent() const { return true; };
 
         int GetDepth() const
         bool CanGetTextExtent() const { return true; };
 
         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 ;
 


@@ -257,10 +246,10 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
         wxCoord GetCharWidth() const;
 
         void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))
         wxCoord GetCharWidth() const;
 
         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 ; };
+            { 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() ;
 


@@ -282,10 +271,10 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
         void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
 
         void SetClippingRegion(wxCoord  WXUNUSED(x), wxCoord  WXUNUSED(y), wxCoord  WXUNUSED(width), wxCoord  WXUNUSED(height))
         void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
 
         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 ; };
+            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };

 
         void SetPalette(const wxPalette&  WXUNUSED(palette))
 
         void SetPalette(const wxPalette&  WXUNUSED(palette))

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

 
         void SetBackground( const wxBrush &brush ) ;
 
 
         void SetBackground( const wxBrush &brush ) ;
 


@@ -296,7 +285,7 @@ class WXDLLIMPEXP_SVG 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 implemented")); return ; };

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


@@ -311,7 +300,7 @@ class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
         void SetUserScale(double xScale, double yScale) ;
 
         bool StartDoc(const wxString&  WXUNUSED(message))
         void SetUserScale(double xScale, double yScale) ;
 
         bool StartDoc(const wxString&  WXUNUSED(message))

-            {  return FALSE; };
+            {  return false; };

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