From: Carl Hetherington Date: Tue, 17 Jan 2023 16:33:35 +0000 (+0100) Subject: Cleanup: use stack-allocated Dialogs. X-Git-Tag: v2.16.41~16 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=45a932e0756a9e1f708606d9704425c8f5c5aeb5 Cleanup: use stack-allocated Dialogs. --- diff --git a/src/wx/recipients_panel.cc b/src/wx/recipients_panel.cc index 58a986ca4..943d55c6c 100644 --- a/src/wx/recipients_panel.cc +++ b/src/wx/recipients_panel.cc @@ -125,14 +125,12 @@ RecipientsPanel::add_recipient (shared_ptr r) void RecipientsPanel::add_recipient_clicked () { - auto d = new RecipientDialog (GetParent(), _("Add recipient")); - if (d->ShowModal() == wxID_OK) { - auto r = std::make_shared(d->name(), d->notes(), d->recipient(), d->emails(), d->utc_offset_hour(), d->utc_offset_minute()); + RecipientDialog dialog(GetParent(), _("Add recipient")); + if (dialog.ShowModal() == wxID_OK) { + auto r = std::make_shared(dialog.name(), dialog.notes(), dialog.recipient(), dialog.emails(), dialog.utc_offset_hour(), dialog.utc_offset_minute()); Config::instance()->add_dkdm_recipient (r); add_recipient (r); } - - d->Destroy (); } @@ -145,21 +143,19 @@ RecipientsPanel::edit_recipient_clicked () auto c = *_selected.begin(); - auto d = new RecipientDialog ( + RecipientDialog dialog( GetParent(), _("Edit recipient"), c.second->name, c.second->notes, c.second->emails, c.second->utc_offset_hour, c.second->utc_offset_minute, c.second->recipient ); - if (d->ShowModal () == wxID_OK) { - c.second->name = d->name (); - c.second->emails = d->emails (); - c.second->notes = d->notes (); - c.second->utc_offset_hour = d->utc_offset_hour (); - c.second->utc_offset_minute = d->utc_offset_minute (); - _targets->SetItemText (c.first, std_to_wx (d->name())); + if (dialog.ShowModal() == wxID_OK) { + c.second->name = dialog.name(); + c.second->emails = dialog.emails(); + c.second->notes = dialog.notes(); + c.second->utc_offset_hour = dialog.utc_offset_hour(); + c.second->utc_offset_minute = dialog.utc_offset_minute(); + _targets->SetItemText(c.first, std_to_wx(dialog.name())); Config::instance()->changed (Config::DKDM_RECIPIENTS); } - - d->Destroy (); }