Merge remote-tracking branch 'origin/main' into v2.17.x

1 files changed, 5 insertions, 5 deletions

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;