X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnew_film_dialog.h;h=a835c7cebae4ebbfe251eb85d29af30c5120bffe;hb=cc3900735839ff4b0da0c046b5c606c440ba917a;hp=70bb7945b1db915fbdc133c1a5ce9ed9af34570a;hpb=e6dd32ca6a32f364dafd99b0fe4bbb6119afb9d7;p=dcpomatic.git

diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 70bb7945b..a835c7ceb 100644
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -19,9 +19,7 @@
 
 #include <wx/wx.h>
 #include <wx/filepicker.h>
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#include "wx_util.h"
 
 class DirPickerCtrl;
 
@@ -31,14 +29,14 @@ public:
 	NewFilmDialog (wxWindow *);
 	~NewFilmDialog ();
 
-	std::string get_path () const;
+	boost::filesystem::path get_path () const;
 
 private:
 	wxTextCtrl* _name;
-#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17)
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 	DirPickerCtrl* _folder;
 #else	
 	wxDirPickerCtrl* _folder;
 #endif	
-	static boost::optional<std::string> _directory;
+	static boost::optional<boost::filesystem::path> _directory;
 };