fixed 3 infinite loops -- the person who tested this code must have had a lot of...

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

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 1785e0a2972a8473a102ca2d1412ff70c571419a..5068f5f83647eca49e54d8bcebdbf6a91ceaa582 100644 (file)
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -1,4 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////

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


@@ -30,7 +29,7 @@
 #include "wx/matrix.h"
 #include <math.h>
 
 #include "wx/matrix.h"
 #include <math.h>
 

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

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


@@ -40,6 +39,7 @@ wxTransformMatrix::wxTransformMatrix(void)
 }
 
 wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix& mat)
 }
 
 wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix& mat)

+    : wxObject()

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


@@ -268,12 +268,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);