Commit 2140efdc authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

Somebody else spelled rectangle as badly as me, fix the mingw build

parent 33616f30

common/drawframe.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -681,7 +681,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU ) 
    DSIZE   clientSizeIU( clientSizeDU.x / scale, clientSizeDU.y / scale );

    DSIZE   clientSizeIU( clientSizeDU.x / scale, clientSizeDU.y / scale );





    // Full drawing or "page" rectangle in internal units

    // Full drawing or "page" rectangle in internal units

    DRECT pageRectIU( 0, 0, GetPageSizeIU().x, GetPageSizeIU().y );

    DBOX    pageRectIU( 0, 0, GetPageSizeIU().x, GetPageSizeIU().y );





    // The upper left corner of the client rectangle in internal units.

    // The upper left corner of the client rectangle in internal units.

    double xIU = aCenterPositionIU.x - clientSizeIU.x / 2.0;

    double xIU = aCenterPositionIU.x - clientSizeIU.x / 2.0;
@@ -695,7 +695,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU ) 
        yIU += pageRectIU.height / 2.0;

        yIU += pageRectIU.height / 2.0;

    }

    }





    DRECT clientRectIU( xIU, yIU, clientSizeIU.x, clientSizeIU.y );

    DBOX    clientRectIU( xIU, yIU, clientSizeIU.x, clientSizeIU.y );

    DSIZE   virtualSizeIU;

    DSIZE   virtualSizeIU;





    if( pageRectIU.GetLeft() < clientRectIU.GetLeft() && pageRectIU.GetRight() > clientRectIU.GetRight() )

    if( pageRectIU.GetLeft() < clientRectIU.GetLeft() && pageRectIU.GetRight() > clientRectIU.GetRight() )

include/vector2d.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -327,21 +327,21 @@ template<class T> bool const VECTOR2<T>::operator!=( VECTOR2<T> const& aVector ) 








/**

/**

 * Class RECT

 * Class BOX2

 * is a description of a rectangle in cartesion coordinate system.

 * is a description of a rectangle in a cartesion coordinate system.

 */

 */

template<class T> class RECT

template<class T> class BOX2

{

{

public:

public:

    RECT() : x(0), y(0), width(0), height(0) {}

    BOX2() : x(0), y(0), width(0), height(0) {}





    RECT( T aX, T aY, T aWidth, T aHeight ):

    BOX2( T aX, T aY, T aWidth, T aHeight ):

        x( aX ), y( aY ), width( aWidth ), height( aHeight )

        x( aX ), y( aY ), width( aWidth ), height( aHeight )

    {}

    {}









    /// Copy constructor

    /// Copy constructor

    RECT( const RECT<T>& aRect ) :

    BOX2( const BOX2<T>& aRect ) :

        x( aRect.x ), y( aRect.y ), width( aRect.width ), height( aRect.height )

        x( aRect.x ), y( aRect.y ), width( aRect.width ), height( aRect.height )

    {}

    {}
@@ -393,7 +393,7 @@ public: 
typedef VECTOR2<double>     DPOINT;

typedef VECTOR2<double>     DPOINT;

typedef DPOINT              DSIZE;

typedef DPOINT              DSIZE;





typedef RECT<double>        DRECT;

typedef BOX2<double>        DBOX;









#endif // VECTOR2D_H_
 
#endif // VECTOR2D_H_