re-renamed DoCreate() to XmDoCreateTLW() to avoid virtual function hiding in other...

[wxWidgets.git] / src / common / matrix.cpp

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 234744492d1ce1ae9f3813e984eba9396d69902d..72a72517e42f09303a58879c94c36097a09985c3 100644 (file)
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -1,3 +1,4 @@
+///////////////////////////////////////////////////////////////////////////////

 // Name:        matrix.cpp
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart
 // Name:        matrix.cpp
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart


@@ -5,12 +6,8 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "matrix.h"
-#endif
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////

 
 // Note: this is intended to be used in wxDC at some point to replace
 // the current system of scaling/translation. It is not yet used.
 
 // Note: this is intended to be used in wxDC at some point to replace
 // the current system of scaling/translation. It is not yet used.


@@ -24,16 +21,16 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"

+#include "wx/math.h"

 #endif
 
 #include "wx/matrix.h"
 #endif
 
 #include "wx/matrix.h"

-#include <math.h>

 
 

-static const double pi = 3.1415926535;
+static const double pi = M_PI;

 
 wxTransformMatrix::wxTransformMatrix(void)
 {
 
 wxTransformMatrix::wxTransformMatrix(void)
 {

-    m_isIdentity = FALSE;
+    m_isIdentity = false;

 
     Identity();
 }
 
     Identity();
 }


@@ -74,10 +71,10 @@ void wxTransformMatrix::operator = (const wxTransformMatrix& mat)
     m_isIdentity = mat.m_isIdentity;
 }
 
     m_isIdentity = mat.m_isIdentity;
 }
 

-bool wxTransformMatrix::operator == (const wxTransformMatrix& mat)
+bool wxTransformMatrix::operator == (const wxTransformMatrix& mat) const

 {
 {

-    if (m_isIdentity==TRUE && mat.m_isIdentity==TRUE)
-        return TRUE;
+    if (m_isIdentity && mat.m_isIdentity)
+        return true;

 
     int i, j;
     for (i = 0; i < 3; i++)
 
     int i, j;
     for (i = 0; i < 3; i++)


@@ -85,13 +82,13 @@ bool wxTransformMatrix::operator == (const wxTransformMatrix& mat)
         for (j = 0; j < 3; j++)
         {
             if (m_matrix[i][j] != mat.m_matrix[i][j])
         for (j = 0; j < 3; j++)
         {
             if (m_matrix[i][j] != mat.m_matrix[i][j])

-                return FALSE;
+                return false;

         }
     }
         }
     }

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxTransformMatrix::operator != (const wxTransformMatrix& mat)
+bool wxTransformMatrix::operator != (const wxTransformMatrix& mat) const

 {
     return (! ((*this) == mat));
 }
 {
     return (! ((*this) == mat));
 }


@@ -147,11 +144,11 @@ bool wxTransformMatrix::Invert(void)
             }
         }
         m_isIdentity = IsIdentity1();
             }
         }
         m_isIdentity = IsIdentity1();

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -160,9 +157,9 @@ bool wxTransformMatrix::Identity(void)
 {
     m_matrix[0][0] = m_matrix[1][1] = m_matrix[2][2] = 1.0;
     m_matrix[1][0] = m_matrix[2][0] = m_matrix[0][1] = m_matrix[2][1] = m_matrix[0][2] = m_matrix[1][2] = 0.0;
 {
     m_matrix[0][0] = m_matrix[1][1] = m_matrix[2][2] = 1.0;
     m_matrix[1][0] = m_matrix[2][0] = m_matrix[0][1] = m_matrix[2][1] = m_matrix[0][2] = m_matrix[1][2] = 0.0;

-    m_isIdentity = TRUE;
+    m_isIdentity = true;

 
 

-    return TRUE;
+    return true;

 }
 
 // Scale by scale (isotropic scaling i.e. the same in x and y):
 }
 
 // Scale by scale (isotropic scaling i.e. the same in x and y):


@@ -182,7 +179,7 @@ bool wxTransformMatrix::Scale(double scale)
     }
     m_isIdentity = IsIdentity1();
 
     }
     m_isIdentity = IsIdentity1();
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -268,12 +265,12 @@ wxTransformMatrix&  wxTransformMatrix::Mirror(bool x, bool y)
     if (x)
     {
         temp.m_matrix[1][1] = -1;
     if (x)
     {
         temp.m_matrix[1][1] = -1;

-        temp.m_isIdentity=FALSE;
+        temp.m_isIdentity=false;

     }
     if (y)
     {
         temp.m_matrix[0][0] = -1;
     }
     if (y)
     {
         temp.m_matrix[0][0] = -1;

-        temp.m_isIdentity=FALSE;
+        temp.m_isIdentity=false;

     }
 
     *this = temp * (*this);
     }
 
     *this = temp * (*this);


@@ -296,7 +293,7 @@ bool wxTransformMatrix::Translate(double dx, double dy)
 
     m_isIdentity = IsIdentity1();
 
 
     m_isIdentity = IsIdentity1();
 

-    return TRUE;
+    return true;

 }
 
 // Rotate clockwise by the given number of degrees:
 }
 
 // Rotate clockwise by the given number of degrees:


@@ -306,7 +303,7 @@ bool wxTransformMatrix::Translate(double dx, double dy)
 bool wxTransformMatrix::Rotate(double degrees)
 {
     Rotate(-degrees,0,0);
 bool wxTransformMatrix::Rotate(double degrees)
 {
     Rotate(-degrees,0,0);

-    return TRUE;
+    return true;

 }
 
 // counter clockwise rotate around a point
 }
 
 // counter clockwise rotate around a point


@@ -384,13 +381,13 @@ bool wxTransformMatrix::TransformPoint(double x, double y, double& tx, double& t
 {
     if (IsIdentity())
     {
 {
     if (IsIdentity())
     {

-        tx = x; ty = y; return TRUE;
+        tx = x; ty = y; return true;

     }
 
     tx = x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0];
     ty = x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1];
 
     }
 
     tx = x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0];
     ty = x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1];
 

-    return TRUE;
+    return true;

 }
 
 // Transform a point from device to logical coordinates.
 }
 
 // Transform a point from device to logical coordinates.


@@ -407,18 +404,18 @@ bool wxTransformMatrix::InverseTransformPoint(double x, double y, double& tx, do
 {
     if (IsIdentity())
     {
 {
     if (IsIdentity())
     {

-        tx = x; ty = y; return TRUE;
+        tx = x; ty = y; return true;

     }
 
     double z = (1.0 - m_matrix[0][2] * x - m_matrix[1][2] * y) / m_matrix[2][2];
     if (z == 0.0)
     {
 //      z = 0.0000001;
     }
 
     double z = (1.0 - m_matrix[0][2] * x - m_matrix[1][2] * y) / m_matrix[2][2];
     if (z == 0.0)
     {
 //      z = 0.0000001;

-        return FALSE;
+        return false;

     }
     tx = x * m_matrix[0][0] + y * m_matrix[1][0] + z * m_matrix[2][0];
     ty = x * m_matrix[0][1] + y * m_matrix[1][1] + z * m_matrix[2][1];
     }
     tx = x * m_matrix[0][0] + y * m_matrix[1][0] + z * m_matrix[2][0];
     ty = x * m_matrix[0][1] + y * m_matrix[1][1] + z * m_matrix[2][1];

-    return TRUE;
+    return true;

 }
 
 wxTransformMatrix& wxTransformMatrix::operator*=(const double& t)
 }
 
 wxTransformMatrix& wxTransformMatrix::operator*=(const double& t)