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 5fb66240868ad54339af30def6178d80371230b7..96aee8285527b0a5ba3ed0d52a4cb82d52d50235 100644 (file)
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -4,7 +4,7 @@
 // Modified by: Klaas Holwerda
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -29,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)
 {


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

+    : wxObject()

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