diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-09-19 15:07:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-09-19 15:07:03 +0100 |
| commit | f98c4cdec82fc2fbdcc4ca19748d09b0ea0556b4 (patch) | |
| tree | 82e1fd2170c3e9ca246c464086d96ec809dc128f /src/wx | |
| parent | 98fd67b22129cefc6995cae6bc5b958a886e2e0c (diff) | |
Some boost::filesystem::path cleanups; tweak for changes to libdcp.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/config_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/new_film_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/new_film_dialog.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 7f1efa52f..dba83804e 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -179,7 +179,7 @@ ConfigDialog::make_misc_panel () _default_still_length->SetValue (config->default_still_length ()); _default_still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ConfigDialog::default_still_length_changed, this)); - _default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())))); + _default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ())); _default_directory->Bind (wxEVT_COMMAND_DIRPICKER_CHANGED, boost::bind (&ConfigDialog::default_directory_changed, this)); _default_dci_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ConfigDialog::edit_default_dci_metadata_clicked, this)); diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index 6a8935232..2612a6afe 100644 --- a/src/wx/new_film_dialog.cc +++ b/src/wx/new_film_dialog.cc @@ -29,7 +29,7 @@ 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")) @@ -57,7 +57,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent) _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); diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h index f8f3aa08d..4176b060d 100644 --- a/src/wx/new_film_dialog.h +++ b/src/wx/new_film_dialog.h @@ -38,5 +38,5 @@ private: #else wxDirPickerCtrl* _folder; #endif - static boost::optional<std::string> _directory; + static boost::optional<boost::filesystem::path> _directory; }; |