Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-13 20:34:25 +00:00
parent 23b4f32040
commit f9189014b7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/propgrid/propgrid.cpp
View File

@@ -3055,6 +3055,8 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
if ( m_inDoPropertyChanged ) if ( m_inDoPropertyChanged )
return true; return true;
wxWindow* editor = GetEditorControl();
m_pState->m_anyModified = 1; m_pState->m_anyModified = 1;
m_inDoPropertyChanged = 1; m_inDoPropertyChanged = 1;
@@ -3082,7 +3084,7 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
p->m_flags |= wxPG_PROP_MODIFIED; p->m_flags |= wxPG_PROP_MODIFIED;
if ( p == m_selected && (m_windowStyle & wxPG_BOLD_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. // control.
if ( selFlags & wxPG_SEL_DIALOGVAL ) if ( selFlags & wxPG_SEL_DIALOGVAL )
{ {
if ( m_wndEditor ) if ( editor )
p->GetEditorClass()->UpdateControl(p, m_wndEditor); p->GetEditorClass()->UpdateControl(p, editor);
} }
else else
{ {