From a4c605ce975f89d3cc390f58680c520e0748b821 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Fri, 3 Jul 2009 14:39:26 +0000 Subject: [PATCH] Colour property with attribute wxPG_COLOUR_ALLOW_CUSTOM = false did not render correctly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/advprops.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 7fa93bcc19..ed2944c9fc 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -1306,8 +1306,10 @@ void wxSystemColourProperty::OnCustomPaint( wxDC& dc, const wxRect& rect, { wxColour col; - if ( paintdata.m_choiceItem >= 0 && paintdata.m_choiceItem < (int)m_choices.GetCount() && - paintdata.m_choiceItem != GetCustomColourIndex() ) + if ( paintdata.m_choiceItem >= 0 && + paintdata.m_choiceItem < (int)m_choices.GetCount() && + (paintdata.m_choiceItem != GetCustomColourIndex() || + m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) ) { int colInd = m_choices[paintdata.m_choiceItem].GetValue(); col = GetColour( colInd ); -- 2.45.2