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 70bb7945b1db915fbdc133c1a5ce9ed9af34570a..a835c7cebae4ebbfe251eb85d29af30c5120bffe 100644
(file)
--- 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>
#include <wx/wx.h>
#include <wx/filepicker.h>
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#include "wx_util.h"
class DirPickerCtrl;
class DirPickerCtrl;
@@
-31,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;
-#if
defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17)
+#if
def DCPOMATIC_USE_OWN_DIR_PICKER
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
#endif
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
#endif
- static boost::optional<
std::string
> _directory;
+ static boost::optional<
boost::filesystem::path
> _directory;
};
};