Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'donovan6000_wxdataviewitem_fix' of https://github.com/donovan6000/wxWidgets

Browse Source 
Render disabled items as greyed out in wxDataViewCtrl.

See https://github.com/wxWidgets/wxWidgets/pull/1277
This commit is contained in:
Vadim Zeitlin
2019-03-26 15:05:59 +01:00
parent 9926619adf 7cd48f7db1
commit 82290bfd10
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/datavcmn.cpp
View File

@@ -1067,7 +1067,7 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text,
int flags = 0; int flags = 0;
if ( state & wxDATAVIEW_CELL_SELECTED ) if ( state & wxDATAVIEW_CELL_SELECTED )
flags |= wxCONTROL_SELECTED; flags |= wxCONTROL_SELECTED;
if ( !GetOwner()->GetOwner()->IsEnabled() ) if ( !(GetOwner()->GetOwner()->IsEnabled() && GetEnabled()) )
flags |= wxCONTROL_DISABLED; flags |= wxCONTROL_DISABLED;
// Notice that we intentionally don't use any alignment here: it is not // Notice that we intentionally don't use any alignment here: it is not

2
src/generic/datavgen.cpp
View File

@@ -1298,7 +1298,7 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
if (m_toggle) if (m_toggle)
flags |= wxCONTROL_CHECKED; flags |= wxCONTROL_CHECKED;
if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE || if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE ||
GetEnabled() == false) !(GetOwner()->GetOwner()->IsEnabled() && GetEnabled()))
flags |= wxCONTROL_DISABLED; flags |= wxCONTROL_DISABLED;
// Ensure that the check boxes always have at least the minimal required // Ensure that the check boxes always have at least the minimal required