From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sat, 13 Sep 2008 20:34:25 +0000 (+0000)
Subject: wxPropertyGrid::DoPropertyChanged() incorrectly passed raw m_wndEditor pointer to... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f9189014b7162155ab7d4b329c0e5c99bbd9acf3

wxPropertyGrid::DoPropertyChanged() incorrectly passed raw m_wndEditor pointer to UpdateControl(). Now editor pointer is acquired via GetEditorControl(), as appropriate.

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

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 956de165fb..f412d75de9 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3055,6 +3055,8 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
     if ( m_inDoPropertyChanged )
         return true;
 
+    wxWindow* editor = GetEditorControl();
+
     m_pState->m_anyModified = 1;
 
     m_inDoPropertyChanged = 1;
@@ -3082,7 +3084,7 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
         p->m_flags |= wxPG_PROP_MODIFIED;
         if ( p == m_selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
         {
-            if ( m_wndEditor )
+            if ( editor )
                 SetCurControlBoldFont();
         }
     }
@@ -3099,7 +3101,7 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
 
         if ( pwc == m_selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
         {
-            if ( m_wndEditor )
+            if ( editor )
                 SetCurControlBoldFont();
         }
 
@@ -3115,8 +3117,8 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
     // control.
     if ( selFlags & wxPG_SEL_DIALOGVAL )
     {
-        if ( m_wndEditor )
-            p->GetEditorClass()->UpdateControl(p, m_wndEditor);
+        if ( editor )
+            p->GetEditorClass()->UpdateControl(p, editor);
     }
     else
     {