Merge master.

[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 3d1253ecc7d3cbae849afc61ca20ad3195aca67a..f8f3aa08dd1ca5f360afaa495299afd1d8470346 100644 (file)
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -19,6 +19,7 @@
 
 #include <wx/wx.h>
 #include <wx/filepicker.h>
+#include "wx_util.h"
 
 class DirPickerCtrl;
 
@@ -26,14 +27,16 @@ class NewFilmDialog : public wxDialog
 {
 public:
        NewFilmDialog (wxWindow *);
+       ~NewFilmDialog ();
 
        std::string get_path () const;
 
 private:
        wxTextCtrl* _name;
-#ifdef __WXMSW__       
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        DirPickerCtrl* _folder;
-#else
+#else  
        wxDirPickerCtrl* _folder;
 #endif 
+       static boost::optional<std::string> _directory;
 };