No-op: remove all trailing whitespace.

[dcpomatic.git] / src / wx / new_film_dialog.h

diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 715f71f516f309d9db14b9761c40ef9b348f7591..6ce3d6e3a20cffb7a68862156cbc69bd28bb4a7a 100644 (file)
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,23 +19,25 @@
 
 #include <wx/wx.h>
 #include <wx/filepicker.h>
+#include "wx_util.h"
+#include "table_dialog.h"
 
 class DirPickerCtrl;
 
-class NewFilmDialog : public wxDialog
+class NewFilmDialog : public TableDialog
 {
 public:
        NewFilmDialog (wxWindow *);
        ~NewFilmDialog ();
 
-       std::string get_path () const;
+       boost::filesystem::path get_path () const;
 
 private:
        wxTextCtrl* _name;
-#ifdef __WXMSW__       
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        DirPickerCtrl* _folder;
 #else
        wxDirPickerCtrl* _folder;
 #endif
-       static std::string _directory;
+       static boost::optional<boost::filesystem::path> _directory;
 };