Update to Scintilla 1.53

[wxWidgets.git] / include / wx / matrix.h

diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index 018362a1719afebc404ea8013bce53bf0ada6447..786815b1580603e462bc3bb8057ccb05ed92d726 100644 (file)
--- a/include/wx/matrix.h
+++ b/include/wx/matrix.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        matrix.h
 // Purpose:     wxTransformMatrix class. NOT YET USED
-//! Author:      Chris Breeze, Julian Smart
+// 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, Chris Breeze
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MATRIXH__
 #define _WX_MATRIXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "matrix.h"
 #endif
 
@@ -27,10 +27,10 @@
 // Note: this is intended to be used in wxDC at some point to replace
 // the current system of scaling/translation. It is not yet used.
 
-//:defenition
+//:definition
 //  A 3x3 matrix to do 2D transformations.
-//  It can be used to map data to window coordinates.
-//  But also for manipulating your own data.
+//  It can be used to map data to window coordinates,
+//  and also for manipulating your own data.
 //  For example drawing a picture (composed of several primitives)
 //  at a certain coordinate and angle within another parent picture.
 //  At all times m_isIdentity is set if the matrix itself is an Identity matrix.
@@ -122,11 +122,7 @@ public:
     //!code:           | -1     0      0 |
     //!code: matrix' = |  0    -1      0 | x matrix
     //!code:           |  0     0      1 |
-#if defined(__WXPM__)
     wxTransformMatrix&  Mirror(bool x=TRUE, bool y=FALSE);
-#else
-    wxTransformMatrix&  Mirror(bool x=true, bool y=false);
-#endif
     // Translate by dx, dy:
     //!ex:
     //!code:           | 1  0 dx |