diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-06 21:48:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-06 21:48:01 +0200 |
| commit | 3317a9b30752e2e311e7bfe36a8ce8201b07636a (patch) | |
| tree | beb12e51bab665f17f04f9aea503dd4ca2311d16 /src/wx | |
| parent | 5696315078be7a3f61763690ddc201c558ddcd5a (diff) | |
| parent | fefcccd526bd4cf12dfdf43ce36ccb62b044528e (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | src/wx/file_picker_ctrl.cc | 10 | ||||
| -rw-r--r-- | src/wx/film_name_location_dialog.cc | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 1b55f958c..0c3905097 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -108,6 +108,7 @@ AboutDialog::AboutDialog (wxWindow* parent) written_by.Add (wxT ("Mart Jansink")); written_by.Add (wxT ("Ole Laursen")); written_by.Add (wxT ("Aaron Boxer")); + written_by.Add (wxT ("Benjamin Radel")); add_section (_("Written by"), written_by); wxArrayString with_help_from; diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc index c6aba45b7..39e7669d5 100644 --- a/src/wx/file_picker_ctrl.cc +++ b/src/wx/file_picker_ctrl.cc @@ -42,9 +42,9 @@ FilePickerCtrl::FilePickerCtrl( wxString wildcard, bool open, bool warn_overwrite, - string initial_path_key, - optional<std::string> initial_filename, - optional<boost::filesystem::path> override_path + std::string initial_path_key, + boost::optional<std::string> initial_filename, + boost::optional<boost::filesystem::path> override_path ) : wxPanel (parent) , _prompt (prompt) @@ -72,7 +72,7 @@ FilePickerCtrl::FilePickerCtrl( void -FilePickerCtrl::set_filename(optional<string> filename) +FilePickerCtrl::set_filename(boost::optional<string> filename) { if (filename) { _file->SetLabel(std_to_wx(*filename)); @@ -83,7 +83,7 @@ FilePickerCtrl::set_filename(optional<string> filename) void -FilePickerCtrl::set_path(optional<boost::filesystem::path> path) +FilePickerCtrl::set_path(boost::optional<boost::filesystem::path> path) { _path = path; diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc index 9d309810e..b988d6251 100644 --- a/src/wx/film_name_location_dialog.cc +++ b/src/wx/film_name_location_dialog.cc @@ -40,7 +40,7 @@ using boost::bind; using boost::optional; -optional<boost::filesystem::path> FilmNameLocationDialog::_directory; +boost::optional<boost::filesystem::path> FilmNameLocationDialog::_directory; FilmNameLocationDialog::FilmNameLocationDialog (wxWindow* parent, wxString title, bool offer_templates) @@ -123,7 +123,7 @@ FilmNameLocationDialog::path () const } -optional<string> +boost::optional<string> FilmNameLocationDialog::template_name () const { if (!_use_template->GetValue() || _template_name->GetSelection() == -1) { |