haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added forgotten lines from patch "EEschema selection.patch"

This commit is contained in:
jean-pierre charras 2010-10-06 20:43:51 +02:00
parent 035979d39f
commit 3c6c7134af
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/gr_basic.cpp
View File

@ -107,7 +107,7 @@ static wxDC* s_DC_lastDC = NULL;
/* Local functions: */ /* Local functions: */
static void GRSRect( EDA_Rect* aClipBox, wxDC* aDC, int x1, int y1, static void GRSRect( EDA_Rect* aClipBox, wxDC* aDC, int x1, int y1,
int x2, int y2, int aWidth, int aColor, int x2, int y2, int aWidth, int aColor,
int aStyle = wxSOLID ); wxPenStyle aStyle = wxPENSTYLE_SOLID );
/* /*
* Macro clipping the trace of a line: * 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 ); 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 x1 = GRMapX( aRect.GetX() );
int y1 = GRMapY( aRect.GetY() ); 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, 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 ) if( x1 > x2 )
EXCHG( x1, x2 ); EXCHG( x1, x2 );

6
include/gr_basic.h
View File

@ -24,6 +24,12 @@ class EDA_Rect;
#define GR_M_MIDDLE_DOWN 0x40000000 #define GR_M_MIDDLE_DOWN 0x40000000
#define GR_M_DCLICK 0x80000000 #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_XorMode;
extern int g_DrawBgColor; extern int g_DrawBgColor;