merged MapBitmap() from 2.2 branch

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

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 1785e0a2972a8473a102ca2d1412ff70c571419a..a19d8ea477c0f1a8b7a43152574fb5958a9534ce 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
@@ -30,7 +29,9 @@
 #include "wx/matrix.h"
 #include <math.h>
 
+#if ! (defined(__WXMAC__) && defined(__UNIX__))
 const double pi = 3.1415926535;
+#endif
 
 wxTransformMatrix::wxTransformMatrix(void)
 {
@@ -268,12 +269,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);