X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnew_film_dialog.h;h=01064f2a6e2c1ad433c9dafce0b6342ed791ea8c;hb=696ff1c534d59483bed3db06705b554f615a7b85;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..01064f2a6 100644
--- 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,26 +19,25 @@
 
 #include <wx/wx.h>
 #include <wx/filepicker.h>
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#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;
-#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17)
+#ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _folder;
-#else	
+#else
 	wxDirPickerCtrl* _folder;
-#endif	
-	static boost::optional<std::string> _directory;
+#endif
+	static boost::optional<boost::filesystem::path> _directory;
 };