projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add server configuration back in.
[dcpomatic.git]
/
src
/
wx
/
new_film_dialog.cc
diff --git
a/src/wx/new_film_dialog.cc
b/src/wx/new_film_dialog.cc
index 5e28489034a714fea2adbe3f8f96ea70d7f49b6d..2612a6afe9afabc987847dcbc0a1547ca6c43850 100644
(file)
--- a/
src/wx/new_film_dialog.cc
+++ b/
src/wx/new_film_dialog.cc
@@
-29,7
+29,7
@@
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
-boost::optional<
string
> NewFilmDialog::_directory;
+boost::optional<
boost::filesystem::path
> NewFilmDialog::_directory;
NewFilmDialog::NewFilmDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("New Film"))
NewFilmDialog::NewFilmDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("New Film"))
@@
-50,14
+50,14
@@
NewFilmDialog::NewFilmDialog (wxWindow* parent)
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
_folder = new DirPickerCtrl (this);
#else
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
_folder = new DirPickerCtrl (this);
#else
- _folder = new wxDirPickerCtrl (this);
+ _folder = new wxDirPickerCtrl (this
, wxID_ANY
);
#endif
if (!_directory) {
_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
}
#endif
if (!_directory) {
_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
}
- _folder->SetPath (std_to_wx (_directory.get()));
+ _folder->SetPath (std_to_wx (_directory.get()
.string()
));
table->Add (_folder, 1, wxEXPAND);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
table->Add (_folder, 1, wxEXPAND);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);