From e292de4bb094478da84b45e497bcf2e0ac2781f2 Mon Sep 17 00:00:00 2001 From: donovan6000 Date: Mon, 25 Mar 2019 17:59:56 -0700 Subject: [PATCH] Disabling also checks if control is disabled --- src/common/datavcmn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 59bd6532f8..28cf44bccf 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -1067,7 +1067,7 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text, int flags = 0; if ( state & wxDATAVIEW_CELL_SELECTED ) flags |= wxCONTROL_SELECTED; - if ( !GetEnabled() ) + if ( !(GetOwner()->GetOwner()->IsEnabled() && GetEnabled()) ) flags |= wxCONTROL_DISABLED; // Notice that we intentionally don't use any alignment here: it is not