MinGW compilation fixes.

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

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 05b6a90982ae9e2f9e8343280c7e63aad3fd5915..d0d16755a35e3832044b1b30d99d23114106d4e0 100644 (file)
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -1,15 +1,14 @@
-/////////////////////////////////////////////////////////////////////////////
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "matrix.h"
 #endif
 
@@ -27,10 +26,10 @@
 #include "wx/defs.h"
 #endif
 
-#include "wxmatrix.h"
+#include "wx/matrix.h"
 #include <math.h>
 
-const double pi = 3.1415926535;
+static const double pi = 3.1415926535;
 
 wxTransformMatrix::wxTransformMatrix(void)
 {
@@ -40,6 +39,7 @@ wxTransformMatrix::wxTransformMatrix(void)
 }
 
 wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix& mat)
+    : wxObject()
 {
     (*this) = mat;
 }
@@ -268,12 +268,12 @@ wxTransformMatrix&  wxTransformMatrix::Mirror(bool x, bool y)
     if (x)
     {
         temp.m_matrix[1][1] = -1;
-        temp.m_isIdentity=false;
+        temp.m_isIdentity=FALSE;
     }
     if (y)
     {
         temp.m_matrix[0][0] = -1;
-        temp.m_isIdentity=false;
+        temp.m_isIdentity=FALSE;
     }
 
     *this = temp * (*this);