From b9bb74e9fc1c1eb611251ba3d7da4374233f9fa5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 18 Dec 2011 12:27:04 +0000 Subject: [PATCH] No changes, just use wxScopedPtr instead of explicit "delete". Use wxScopedPtr in wxGenericFileDirButton to ensure that the dialog created by it is always destroyed, even if an exception is thrown while showing the dialog or while processing the event we generate after showing it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/filepickerg.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp index 2b1c6d271d..aaeffe2e34 100644 --- a/src/generic/filepickerg.cpp +++ b/src/generic/filepickerg.cpp @@ -28,6 +28,8 @@ #include "wx/filepicker.h" +#include "wx/scopedptr.h" + // ============================================================================ // implementation @@ -92,18 +94,16 @@ bool wxGenericFileDirButton::Create(wxWindow *parent, void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) { - wxDialog *p = CreateDialog(); + wxScopedPtr p(CreateDialog()); if (p->ShowModal() == wxID_OK) { // save updated path in m_path - UpdatePathFromDialog(p); + UpdatePathFromDialog(p.get()); // fire an event wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path); GetEventHandler()->ProcessEvent(event); } - - wxDELETE(p); } #endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL -- 2.45.2