projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 bfcbd423c2cb31a3cc60a9a07bfbc15ab8ad7e17..a835c7cebae4ebbfe251eb85d29af30c5120bffe 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/wx.h>
#include <wx/filepicker.h>
+#include "wx_util.h"
class DirPickerCtrl;
class DirPickerCtrl;
@@
-28,14
+29,14
@@
public:
NewFilmDialog (wxWindow *);
~NewFilmDialog ();
NewFilmDialog (wxWindow *);
~NewFilmDialog ();
-
std::string
get_path () const;
+
boost::filesystem::path
get_path () const;
private:
wxTextCtrl* _name;
private:
wxTextCtrl* _name;
-#ifdef
__WXMSW__
+#ifdef
DCPOMATIC_USE_OWN_DIR_PICKER
DirPickerCtrl* _folder;
DirPickerCtrl* _folder;
-#else
+#else
wxDirPickerCtrl* _folder;
wxDirPickerCtrl* _folder;
-#endif
- static boost::optional<
std::string
> _directory;
+#endif
+ static boost::optional<
boost::filesystem::path
> _directory;
};
};