Commit 3c6c7134 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

added forgotten lines from patch "EEschema selection.patch"

parent 035979d3

common/gr_basic.cpp

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static wxDC* s_DC_lastDC = NULL; 
/* Local functions: */

static void GRSRect( EDA_Rect* aClipBox, wxDC* aDC, int x1, int y1,

                     int x2, int y2, int aWidth, int aColor,

                     int aStyle = wxSOLID );

                     wxPenStyle aStyle = wxPENSTYLE_SOLID );



/*

 * Macro clipping the trace of a line:
@@ -1672,7 +1672,7 @@ void GRRect( EDA_Rect* aClipBox, wxDC* aDC, int x1, int y1, int x2, int y2, int 
    GRSRect( aClipBox, aDC, x1, y1, x2, y2, 0, aColor );

}



void GRRectPs( EDA_Rect* aClipBox, wxDC* aDC, const EDA_Rect& aRect, int aColor, int aStyle )

void GRRectPs( EDA_Rect* aClipBox, wxDC* aDC, const EDA_Rect& aRect, int aColor, wxPenStyle aStyle )

{

    int x1 = GRMapX( aRect.GetX() );

    int y1 = GRMapY( aRect.GetY() );
@@ -1746,7 +1746,7 @@ void GRFilledRect( EDA_Rect* ClipBox, wxDC* DC, int x1, int y1, int x2, int y2, 
 */



void GRSRect( EDA_Rect* aClipBox, wxDC* aDC, int x1, int y1, int x2, int y2,

              int aWidth, int aColor, int aStyle )

              int aWidth, int aColor, wxPenStyle aStyle )

{

    if( x1 > x2 )

        EXCHG( x1, x2 );

include/gr_basic.h

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ class EDA_Rect; 
#define GR_M_MIDDLE_DOWN 0x40000000

#define GR_M_DCLICK      0x80000000



//wxWidgets 2.8 compatibility

#if !wxCHECK_VERSION(2,9,0)

#define wxPENSTYLE_SOLID wxSOLID

typedef int wxPenStyle;

#endif





extern int g_XorMode;

extern int g_DrawBgColor;