Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/affinematrix2d.h b/include/wx/affinematrix2d.h
index dfd49696142f829891cb146aa088959f795fee25..28055f8d35f140d1636a0c461d77afd378a93cd3 100644 (file)
--- a/include/wx/affinematrix2d.h
+++ b/include/wx/affinematrix2d.h
@@ -4,12 +4,16 @@
 // Author:       Based on wxTransformMatrix by Chris Breeze, Julian Smart
 // Created:      2011-04-05
 // Copyright:    (c) wxWidgets team
 // Author:       Based on wxTransformMatrix by Chris Breeze, Julian Smart
 // Created:      2011-04-05
 // Copyright:    (c) wxWidgets team

-// Licence:      wxWidgets licence
+// Licence:      wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_AFFINEMATRIX2D_H_
 #define _WX_AFFINEMATRIX2D_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_AFFINEMATRIX2D_H_
 #define _WX_AFFINEMATRIX2D_H_
 

+#include "wx/defs.h"
+
+#if wxUSE_GEOMETRY
+

 #include "wx/affinematrix2dbase.h"
 
 // A simple implementation of wxAffineMatrix2DBase interface done entirely in
 #include "wx/affinematrix2dbase.h"
 
 // A simple implementation of wxAffineMatrix2DBase interface done entirely in


@@ -32,7 +36,7 @@ public:
     virtual bool IsEqual(const wxAffineMatrix2DBase& t) const;
     virtual void Translate(wxDouble dx, wxDouble dy);
     virtual void Scale(wxDouble xScale, wxDouble yScale);
     virtual bool IsEqual(const wxAffineMatrix2DBase& t) const;
     virtual void Translate(wxDouble dx, wxDouble dy);
     virtual void Scale(wxDouble xScale, wxDouble yScale);

-    virtual void Rotate(wxDouble ccRadians);
+    virtual void Rotate(wxDouble cRadians);

 
 protected:
     virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const;
 
 protected:
     virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const;


@@ -42,4 +46,6 @@ private:
     wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
 };
 
     wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
 };
 

+#endif // wxUSE_GEOMETRY
+

 #endif // _WX_AFFINEMATRIX2D_H_
 #endif // _WX_AFFINEMATRIX2D_H_