re-fix MinGW DLL compilation

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

diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index 8061667a3a211fbc23f9cc7198be6ac1effa5c27..da6c5da78f05d055d157970f2c693b8cc06a0bef 100644 (file)
--- a/include/wx/matrix.h
+++ b/include/wx/matrix.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        matrix.h
-// Purpose:     wxTransformMatrix class. NOT YET USED
-// Author:      Chris Breeze, Julian Smart
+// Name:         wx/matrix.h
+// Purpose:      wxTransformMatrix class. NOT YET USED
+// Author:       Chris Breeze, Julian Smart

 // Modified by:  Klaas Holwerda
 // Modified by:  Klaas Holwerda

-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart, Chris Breeze
-// Licence:     wxWindows licence
+// Created:      01/02/97
+// RCS-ID:       $Id$
+// Copyright:    (c) Julian Smart, Chris Breeze
+// Licence:      wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MATRIXH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MATRIXH__


@@ -14,6 +14,7 @@
 
 //! headerfiles="matrix.h wx/object.h"
 #include "wx/object.h"
 
 //! headerfiles="matrix.h wx/object.h"
 #include "wx/object.h"

+#include "wx/math.h"

 
 //! codefiles="matrix.cpp"
 
 
 //! codefiles="matrix.cpp"
 


@@ -31,7 +32,7 @@
 //  at a certain coordinate and angle within another parent picture.
 //  At all times m_isIdentity is set if the matrix itself is an Identity matrix.
 //  It is used where possible to optimize calculations.
 //  at a certain coordinate and angle within another parent picture.
 //  At all times m_isIdentity is set if the matrix itself is an Identity matrix.
 //  It is used where possible to optimize calculations.

-class WXDLLEXPORT wxTransformMatrix: public wxObject
+class WXDLLIMPEXP_CORE wxTransformMatrix: public wxObject

 {
 public:
     wxTransformMatrix(void);
 {
 public:
     wxTransformMatrix(void);


@@ -93,7 +94,7 @@ public:
     // Is the matrix the identity matrix?
     // Only returns a flag, which is set whenever an operation
     // is done.
     // Is the matrix the identity matrix?
     // Only returns a flag, which is set whenever an operation
     // is done.

-    inline bool IsIdentity(void) const { return m_isIdentity; };
+    inline bool IsIdentity(void) const { return m_isIdentity; }

 
     // This does an actual check.
     inline bool IsIdentity1(void) const ;
 
     // This does an actual check.
     inline bool IsIdentity1(void) const ;


@@ -214,15 +215,15 @@ inline double wxTransformMatrix::TransformY(double y) const
 inline bool wxTransformMatrix::IsIdentity1(void) const
 {
     return
 inline bool wxTransformMatrix::IsIdentity1(void) const
 {
     return

-     (m_matrix[0][0] == 1.0 &&
-      m_matrix[1][1] == 1.0 &&
-      m_matrix[2][2] == 1.0 &&
-      m_matrix[1][0] == 0.0 &&
-      m_matrix[2][0] == 0.0 &&
-      m_matrix[0][1] == 0.0 &&
-      m_matrix[2][1] == 0.0 &&
-      m_matrix[0][2] == 0.0 &&
-      m_matrix[1][2] == 0.0) ;
+    ( wxIsSameDouble(m_matrix[0][0], 1.0) &&
+      wxIsSameDouble(m_matrix[1][1], 1.0) &&
+      wxIsSameDouble(m_matrix[2][2], 1.0) &&
+      wxIsSameDouble(m_matrix[1][0], 0.0) &&
+      wxIsSameDouble(m_matrix[2][0], 0.0) &&
+      wxIsSameDouble(m_matrix[0][1], 0.0) &&
+      wxIsSameDouble(m_matrix[2][1], 0.0) &&
+      wxIsSameDouble(m_matrix[0][2], 0.0) &&
+      wxIsSameDouble(m_matrix[1][2], 0.0) );

 }
 
 // Calculates the determinant of a 2 x 2 matrix
 }
 
 // Calculates the determinant of a 2 x 2 matrix


@@ -231,5 +232,4 @@ inline double wxCalculateDet(double a11, double a21, double a12, double a22)
     return a11 * a22 - a12 * a21;
 }
 
     return a11 * a22 - a12 * a21;
 }
 

-#endif
-    // _WX_MATRIXH__
+#endif // _WX_MATRIXH__