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

Fixed bug: wxPGProperty::SetName() crashed if it was called before property was added to grid (fixes #11111)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-08-16 15:17:50 +00:00
parent 95bd284e77
commit 5fdb635092
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/property.h
View File

@@ -1957,7 +1957,7 @@ public:
void SetLabel( const wxString& label ) { m_label = label; } void SetLabel( const wxString& label ) { m_label = label; }
inline void SetName( const wxString& newName ); void SetName( const wxString& newName );
/** /**
Changes what sort of parent this property is for its children. Changes what sort of parent this property is for its children.

5
include/wx/propgrid/propgrid.h
View File

@@ -1914,11 +1914,6 @@ inline void wxPGProperty::SetEditor( const wxString& editorName )
m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName); m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName);
} }
inline void wxPGProperty::SetName( const wxString& newName )
{
GetGrid()->SetPropertyName(this, newName);
}
inline bool wxPGProperty::Hide( bool hide, int flags ) inline bool wxPGProperty::Hide( bool hide, int flags )
{ {
return GetGrid()->HideProperty(this, hide, flags); return GetGrid()->HideProperty(this, hide, flags);

9
src/propgrid/property.cpp
View File

@@ -613,6 +613,15 @@ bool wxPGProperty::IsSomeParent( wxPGProperty* candidate ) const
return false; return false;
} }
void wxPGProperty::SetName( const wxString& newName )
{
wxPropertyGrid* pg = GetGrid();
if ( pg )
pg->SetPropertyName(this, newName);
else
DoSetName(newName);
}
wxString wxPGProperty::GetName() const wxString wxPGProperty::GetName() const
{ {