Build fix for Windows.

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 04b37b2c6bb1005b5c3fb03c1a1e3947c7dca71f..b0bc197aa419c2b4ed4762621dd5b993387bd7f3 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -47,7 +47,6 @@
 #include "lib/file_log.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
-#include "lib/scope_guard.h"
 #include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
 #include <dcp/encrypted_kdm.h>
@@ -166,7 +165,7 @@ public:
 
                h = new StaticText (overall_panel, _("DKDM"));
                h->SetFont (subheading_font);
-               right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+               right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
 
                _dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height()));
 #ifndef __WXGTK3__
@@ -218,7 +217,7 @@ public:
 
                h = new StaticText (overall_panel, _("Output"));
                h->SetFont (subheading_font);
-               right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+               right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
                _output = new KDMOutputPanel (overall_panel);
                right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
 
@@ -266,18 +265,16 @@ private:
 
        void help_about ()
        {
-               auto d = new AboutDialog (this);
-               d->ShowModal ();
-               d->Destroy ();
+               AboutDialog dialog(this);
+               dialog.ShowModal();
        }
 
        void help_report_a_problem ()
        {
-               auto d = new ReportProblemDialog (this, shared_ptr<Film>());
-               if (d->ShowModal () == wxID_OK) {
-                       d->report ();
+               ReportProblemDialog dialog(this, shared_ptr<Film>());
+               if (dialog.ShowModal() == wxID_OK) {
+                       dialog.report();
                }
-               d->Destroy ();
        }
 
        void setup_menu (wxMenuBar* m)
@@ -512,15 +509,12 @@ private:
 
        void add_dkdm_clicked ()
        {
-               auto dialog = new FileDialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
-
-               ScopeGuard sg = [dialog]() { dialog->Destroy(); };
-
-               if (!dialog->show()) {
+               FileDialog dialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
+               if (!dialog.show()) {
                        return;
                }
 
-               for (auto path: dialog->paths()) {
+               for (auto path: dialog.paths()) {
                        add_dkdm(path);
                }
        }
@@ -566,17 +560,18 @@ private:
 
        void add_dkdm_folder_clicked ()
        {
-               auto d = new NewDKDMFolderDialog (this);
-               if (d->ShowModal() == wxID_OK) {
-                       auto new_dkdm = make_shared<DKDMGroup>(wx_to_std(d->get()));
-                       auto parent = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
-                       if (!parent) {
-                               parent = Config::instance()->dkdms ();
-                       }
-                       add_dkdm(new_dkdm, parent);
-                       update_dkdm_view();
+               NewDKDMFolderDialog dialog(this);
+               if (dialog.ShowModal() != wxID_OK) {
+                       return;
                }
-               d->Destroy ();
+
+               auto new_dkdm = make_shared<DKDMGroup>(wx_to_std(dialog.get()));
+               auto parent = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
+               if (!parent) {
+                       parent = Config::instance()->dkdms ();
+               }
+               add_dkdm(new_dkdm, parent);
+               update_dkdm_view();
        }
 
        void update_dkdm_view()
@@ -716,15 +711,14 @@ private:
                        return;
                }
 
-               auto d = new wxFileDialog (
+               wxFileDialog dialog(
                        this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"),
                        wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                        );
 
-               if (d->ShowModal() == wxID_OK) {
-                       dkdm->dkdm().as_xml(wx_to_std(d->GetPath()));
+               if (dialog.ShowModal() == wxID_OK) {
+                       dkdm->dkdm().as_xml(wx_to_std(dialog.GetPath()));
                }
-               d->Destroy ();
        }
 
        void dkdm_search_changed()
@@ -775,7 +769,7 @@ private:
 
        bool OnInit () override
        {
-               wxSplashScreen* splash = nullptr;
+               wx_ptr<wxSplashScreen> splash;
 
                try {
                        wxInitAllImageHandlers ();