fix rendering of wxGrid on wxMSW when a dialog is over the grid.
To test the bug: open the "grid" sample and popup the about box, then move it over the grid; without this fix portions of wxGrid were painted as gray (disabled colour) even if the wxGrid itself was not disabled. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,7 +47,7 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
|
|||||||
dc.SetBackgroundMode( wxBRUSHSTYLE_SOLID );
|
dc.SetBackgroundMode( wxBRUSHSTYLE_SOLID );
|
||||||
|
|
||||||
wxColour clr;
|
wxColour clr;
|
||||||
if ( grid.IsEnabled() )
|
if ( grid.IsThisEnabled() )
|
||||||
{
|
{
|
||||||
if ( isSelected )
|
if ( isSelected )
|
||||||
{
|
{
|
||||||
@@ -392,7 +392,7 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
|
|||||||
// TODO some special colours for attr.IsReadOnly() case?
|
// TODO some special colours for attr.IsReadOnly() case?
|
||||||
|
|
||||||
// different coloured text when the grid is disabled
|
// different coloured text when the grid is disabled
|
||||||
if ( grid.IsEnabled() )
|
if ( grid.IsThisEnabled() )
|
||||||
{
|
{
|
||||||
if ( isSelected )
|
if ( isSelected )
|
||||||
{
|
{
|
||||||
@@ -743,7 +743,7 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params)
|
|||||||
|
|
||||||
wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
|
wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
|
||||||
|
|
||||||
wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
|
wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& WXUNUSED(grid),
|
||||||
wxGridCellAttr& WXUNUSED(attr),
|
wxGridCellAttr& WXUNUSED(attr),
|
||||||
wxDC& WXUNUSED(dc),
|
wxDC& WXUNUSED(dc),
|
||||||
int WXUNUSED(row),
|
int WXUNUSED(row),
|
||||||
|
Reference in New Issue
Block a user