no changes, just resolved a conflict

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

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 05b6a90982ae9e2f9e8343280c7e63aad3fd5915..96aee8285527b0a5ba3ed0d52a4cb82d52d50235 100644 (file)
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -1,11 +1,10 @@
-/////////////////////////////////////////////////////////////////////////////

 // Name:        matrix.cpp
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart
 // Modified by: Klaas Holwerda
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Name:        matrix.cpp
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart
 // Modified by: Klaas Holwerda
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -27,10 +26,10 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#include "wxmatrix.h"
+#include "wx/matrix.h"

 #include <math.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);