From 5fdb6350921035ace3d9619bd2d36f776d0653ef Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Sun, 16 Aug 2009 15:17:50 +0000 Subject: [PATCH] Fixed bug: wxPGProperty::SetName() crashed if it was called before property was added to grid (fixes #11111) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/propgrid/property.h | 2 +- include/wx/propgrid/propgrid.h | 5 ----- src/propgrid/property.cpp | 9 +++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index b8a1581e5a..4920599944 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -1957,7 +1957,7 @@ public: 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. diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index d9744d8173..974fd034cd 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -1914,11 +1914,6 @@ inline void wxPGProperty::SetEditor( const wxString& 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 ) { return GetGrid()->HideProperty(this, hide, flags); diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index bbd56c2a03..4f38e08d6b 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -613,6 +613,15 @@ bool wxPGProperty::IsSomeParent( wxPGProperty* candidate ) const return false; } +void wxPGProperty::SetName( const wxString& newName ) +{ + wxPropertyGrid* pg = GetGrid(); + + if ( pg ) + pg->SetPropertyName(this, newName); + else + DoSetName(newName); +} wxString wxPGProperty::GetName() const { -- 2.47.2