Compilation fixes for wxUSE_GEOMETRY==0 build.
Add missing wxUSE_GEOMETRY checks to wxAffineMatrix2D-related code. Closes #13379. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,6 +10,10 @@
|
|||||||
#ifndef _WX_AFFINEMATRIX2D_H_
|
#ifndef _WX_AFFINEMATRIX2D_H_
|
||||||
#define _WX_AFFINEMATRIX2D_H_
|
#define _WX_AFFINEMATRIX2D_H_
|
||||||
|
|
||||||
|
#include "wx/defs.h"
|
||||||
|
|
||||||
|
#if wxUSE_GEOMETRY
|
||||||
|
|
||||||
#include "wx/affinematrix2dbase.h"
|
#include "wx/affinematrix2dbase.h"
|
||||||
|
|
||||||
// A simple implementation of wxAffineMatrix2DBase interface done entirely in
|
// A simple implementation of wxAffineMatrix2DBase interface done entirely in
|
||||||
@@ -42,4 +46,6 @@ private:
|
|||||||
wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
|
wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif // wxUSE_GEOMETRY
|
||||||
|
|
||||||
#endif // _WX_AFFINEMATRIX2D_H_
|
#endif // _WX_AFFINEMATRIX2D_H_
|
||||||
|
@@ -11,6 +11,9 @@
|
|||||||
#define _WX_AFFINEMATRIX2DBASE_H_
|
#define _WX_AFFINEMATRIX2DBASE_H_
|
||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
|
#if wxUSE_GEOMETRY
|
||||||
|
|
||||||
#include "wx/geometry.h"
|
#include "wx/geometry.h"
|
||||||
|
|
||||||
struct wxMatrix2D
|
struct wxMatrix2D
|
||||||
@@ -119,4 +122,6 @@ protected:
|
|||||||
wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0;
|
wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif // wxUSE_GEOMETRY
|
||||||
|
|
||||||
#endif // _WX_AFFINEMATRIX2DBASE_H_
|
#endif // _WX_AFFINEMATRIX2DBASE_H_
|
||||||
|
@@ -13,6 +13,8 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if wxUSE_GEOMETRY
|
||||||
|
|
||||||
#include "wx/affinematrix2d.h"
|
#include "wx/affinematrix2d.h"
|
||||||
#include "wx/math.h"
|
#include "wx/math.h"
|
||||||
|
|
||||||
@@ -177,3 +179,5 @@ bool wxAffineMatrix2D::IsIdentity() const
|
|||||||
m_21 == 0 && m_22 == 1 &&
|
m_21 == 0 && m_22 == 1 &&
|
||||||
m_tx == 0 && m_ty == 0;
|
m_tx == 0 && m_ty == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // wxUSE_GEOMETRY
|
||||||
|
Reference in New Issue
Block a user