Fix class/struct confusion causing build error on macOS.

[dcpomatic.git] / src / wx / file_picker_ctrl.cc

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 3eb05e44dcd966226fe2d0d582e41dfabfb980cc..4bb6518efc2fe33a91ac26812a701a5fba9bd55e 100644 (file)
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -18,20 +18,23 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
-#include "dcpomatic_button.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-#include <wx/stdpaths.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 using namespace std;
 using namespace boost;
 
+
 FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard, bool open, bool warn_overwrite)
        : wxPanel (parent)
        , _prompt (prompt)
@@ -58,7 +61,7 @@ FilePickerCtrl::SetPath (wxString p)
        _path = p;
 
        if (!_path.IsEmpty ()) {
-               _file->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
+               _file->SetLabel(std_to_wx(filesystem::path(wx_to_std(_path)).filename().string()));
        } else {
                _file->SetLabel (_("(None)"));
        }
@@ -80,12 +83,11 @@ FilePickerCtrl::browse_clicked ()
        if (_warn_overwrite) {
                style |= wxFD_OVERWRITE_PROMPT;
        }
-       wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard, style);
-       d->SetPath (_path);
-       if (d->ShowModal () == wxID_OK) {
-               SetPath (d->GetPath ());
+       wxFileDialog dialog(this, _prompt, wxEmptyString, wxEmptyString, _wildcard, style);
+       dialog.SetPath(_path);
+       if (dialog.ShowModal() == wxID_OK) {
+               SetPath(dialog.GetPath());
        }
-       d->Destroy ();
 }
 
 void