Take disabled windows into account in wxFindWindowAtPoint() in wxMSW.

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

diff --git a/src/common/affinematrix2d.cpp b/src/common/affinematrix2d.cpp
index b4605d4e53d26b60b0f25d3d220cd2f07e7e4f68..0b1b9207dc90758d44f24dcf7b6d2745b9324869 100644 (file)
--- a/src/common/affinematrix2d.cpp
+++ b/src/common/affinematrix2d.cpp
@@ -4,7 +4,7 @@
 // Author:      Based on wxTransformMatrix by Chris Breeze, Julian Smart
 // Created:     2011-04-05
 // Copyright:   (c) wxWidgets team
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -106,10 +106,13 @@ bool wxAffineMatrix2D::IsEqual(const wxAffineMatrix2DBase& t) const
 //
 
 // add the translation to this matrix
+// |  1   0   0 |   | m_11  m_12   0 |
+// |  0   1   0 | x | m_21  m_22   0 |
+// | dx  dy   1 |   | m_tx  m_ty   1 |
 void wxAffineMatrix2D::Translate(wxDouble dx, wxDouble dy)
 {
-    m_tx += dx;
-    m_ty += dy;
+    m_tx += m_11 * dx + m_21 * dy;
+    m_ty += m_12 * dx + m_22 * dy;
 }
 
 // add the scale to this matrix