From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Wed, 16 Dec 2009 18:59:46 +0000 (+0000)
Subject: Fixed display of 'InlineHelp' attribute
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/01c226691aabe0eb4bfe86c04b4b9a59d7af367a

Fixed display of 'InlineHelp' attribute

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 4b4b316734..e57a9406ce 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -264,6 +264,10 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
             {
                 text = vInlineHelp.GetString();
                 dc.SetTextForeground(propertyGrid->GetCellDisabledTextColour());
+
+                // Must make the editor NULL to override it's own rendering
+                // code.
+                editor = NULL;
             }
         }
     }