From 524d97b1c22daf69c57ca92c55ef4bbb206a0943 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Sat, 27 Sep 2008 15:29:50 +0000 Subject: [PATCH] Register multibutton editor class in frame ctor instead of CreateGrid() (this fixes memleak in tests) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/propgrid/propgrid.cpp | 8 +++++--- samples/propgrid/propgrid.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index f37c78166f..e403060614 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -1665,10 +1665,8 @@ void FormMain::PopulateWithExamples () // // Test wxSampleMultiButtonEditor - wxPGEditor* pSampleMultiButtonEditor = new wxSampleMultiButtonEditor(); - wxPropertyGrid::RegisterEditorClass(pSampleMultiButtonEditor); pg->Append( new wxLongStringProperty(wxT("MultipleButtons"), wxPG_LABEL) ); - pg->SetPropertyEditor(wxT("MultipleButtons"), pSampleMultiButtonEditor ); + pg->SetPropertyEditor(wxT("MultipleButtons"), m_pSampleMultiButtonEditor ); // Test SingleChoiceProperty pg->Append( new SingleChoiceProperty(wxT("SingleChoiceProperty")) ); @@ -2093,6 +2091,10 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size // Register all editors (SpinCtrl etc.) m_pPropGridManager->RegisterAdditionalEditors(); + // Register our sample custom editors + m_pSampleMultiButtonEditor = + wxPropertyGrid::RegisterEditorClass(new wxSampleMultiButtonEditor()); + // // Create menubar wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF); diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h index e0e44a0993..df754a2055 100644 --- a/samples/propgrid/propgrid.h +++ b/samples/propgrid/propgrid.h @@ -137,6 +137,7 @@ public: wxWindow* m_panel; wxBoxSizer* m_topSizer; + wxPGEditor* m_pSampleMultiButtonEditor; wxPGChoices m_combinedFlags; wxMenuItem* m_itemCatColours; -- 2.45.2