wxBitmap compilation fix for BCC enforced typecast in resource.cpp

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

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 05b6a90982ae9e2f9e8343280c7e63aad3fd5915..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
 // Name:        matrix.cpp
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart


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

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

 #include <math.h>
 
 #include <math.h>
 

+#if ! (defined(__WXMAC__) && defined(__UNIX__))

 const double pi = 3.1415926535;
 const double pi = 3.1415926535;

+#endif

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


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