fixup

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

diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index 0cbeb2ba0d8b4f9691036924b3c14dfd9a05d358..314bd419afcda79e3544f68223334f615418edb3 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
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MATRIXH__
 #define _WX_MATRIXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "matrix.h"
 #endif
 
 #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.
 
 // 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.
 //  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.
 //  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.


@@ -123,7 +123,6 @@ public:
     //!code: matrix' = |  0    -1      0 | x matrix
     //!code:           |  0     0      1 |
     wxTransformMatrix&  Mirror(bool x=true, bool y=false);
     //!code: matrix' = |  0    -1      0 | x matrix
     //!code:           |  0     0      1 |
     wxTransformMatrix&  Mirror(bool x=true, bool y=false);

-

     // Translate by dx, dy:
     //!ex:
     //!code:           | 1  0 dx |
     // Translate by dx, dy:
     //!ex:
     //!code:           | 1  0 dx |