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

wxWidgets compatibility fixes 

* Remove unneeded check
* Fix WX_GRID since upstream renamed a variable in 3.1.3
This commit is contained in:
Ian McInerney 2019-08-29 12:04:18 +02:00 committed by Wayne Stambaugh
parent e675a93b92
commit 8d86d94a4d
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/widgets/wx_grid.cpp
View File

@ -148,7 +148,12 @@ void WX_GRID::DrawColLabel( wxDC& dc, int col )
// It is reported that we need to erase the background to avoid display // It is reported that we need to erase the background to avoid display
// artefacts, see #12055. // artefacts, see #12055.
// wxWidgets renamed this variable between 3.1.2 and 3.1.3 ...
#if wxCHECK_VERSION( 3, 1, 3 )
wxDCBrushChanger setBrush( dc, m_colLabelWin->GetBackgroundColour() );
#else
wxDCBrushChanger setBrush( dc, m_colWindow->GetBackgroundColour() ); wxDCBrushChanger setBrush( dc, m_colWindow->GetBackgroundColour() );
#endif
dc.DrawRectangle(rect); dc.DrawRectangle(rect);
rend.DrawBorder( *this, dc, rect ); rend.DrawBorder( *this, dc, rect );

10
include/gal/cairo/cairo_gal.h
View File

@ -39,16 +39,6 @@
#include <memory> #include <memory>
#if defined(__WXMSW__)
#define SCREEN_DEPTH 24
#else
#if wxCHECK_VERSION( 2, 9, 0 )
#define SCREEN_DEPTH wxBITMAP_SCREEN_DEPTH
#else
#define SCREEN_DEPTH 32
#endif
#endif
/** /**
* @brief Class CAIRO_GAL is the cairo implementation of the graphics abstraction layer. * @brief Class CAIRO_GAL is the cairo implementation of the graphics abstraction layer.
* *