wxPropertyGrid::DoPropertyChanged() incorrectly passed raw m_wndEditor pointer to...

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 956de165fbdcb0d7c2b427e5ad5607266301e195..f412d75de962ce010fba5a49cb0420e93525fb99 100644 (file)
--- 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;
 
     if ( m_inDoPropertyChanged )
         return true;
 

+    wxWindow* editor = GetEditorControl();
+

     m_pState->m_anyModified = 1;
 
     m_inDoPropertyChanged = 1;
     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) )
         {
         p->m_flags |= wxPG_PROP_MODIFIED;
         if ( p == m_selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
         {

-            if ( m_wndEditor )
+            if ( editor )

                 SetCurControlBoldFont();
         }
     }
                 SetCurControlBoldFont();
         }
     }


@@ -3099,7 +3101,7 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
 
         if ( pwc == m_selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
         {
 
         if ( pwc == m_selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
         {

-            if ( m_wndEditor )
+            if ( editor )

                 SetCurControlBoldFont();
         }
 
                 SetCurControlBoldFont();
         }
 


@@ -3115,8 +3117,8 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
     // control.
     if ( selFlags & wxPG_SEL_DIALOGVAL )
     {
     // control.
     if ( selFlags & wxPG_SEL_DIALOGVAL )
     {

-        if ( m_wndEditor )
-            p->GetEditorClass()->UpdateControl(p, m_wndEditor);
+        if ( editor )
+            p->GetEditorClass()->UpdateControl(p, editor);

     }
     else
     {
     }
     else
     {