diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-11-11 01:31:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-11-12 22:11:27 +0100 |
| commit | dfa7b94e802b05bba4243381460eef96626102a0 (patch) | |
| tree | 348ab6b50c7b074e351f2577101ae583a1597c58 /src/wx | |
| parent | 0f225b6df7a9603678a5bd84f9428ff6fb56aea2 (diff) | |
Replace deprecated leaf() with filename().
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/download_certificate_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/file_picker_ctrl.cc | 2 | ||||
| -rw-r--r-- | src/wx/fonts_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/system_font_dialog.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc index b3de4ca2c..3f1509f60 100644 --- a/src/wx/download_certificate_panel.cc +++ b/src/wx/download_certificate_panel.cc @@ -74,7 +74,7 @@ optional<string> DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path file, string url) { try { - _certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf(); + _certificate = dcp::CertificateChain(dcp::file_to_string(file)).leaf(); _url = url; } catch (dcp::MiscError& e) { return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what()); diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc index bf4877891..4bb6518ef 100644 --- a/src/wx/file_picker_ctrl.cc +++ b/src/wx/file_picker_ctrl.cc @@ -61,7 +61,7 @@ FilePickerCtrl::SetPath (wxString p) _path = p; if (!_path.IsEmpty ()) { - _file->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string())); + _file->SetLabel(std_to_wx(filesystem::path(wx_to_std(_path)).filename().string())); } else { _file->SetLabel (_("(None)")); } diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index a035a5ffc..f2c9de5cb 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -121,7 +121,7 @@ FontsDialog::setup () _fonts->SetItem(n, 0, id); _fonts->SetItemData(n, i->id().empty()); if (i->file()) { - _fonts->SetItem(n, 1, i->file()->leaf().string()); + _fonts->SetItem(n, 1, i->file()->filename().string()); } ++n; } diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc index 84285de12..9814ededd 100644 --- a/src/wx/system_font_dialog.cc +++ b/src/wx/system_font_dialog.cc @@ -62,7 +62,7 @@ SystemFontDialog::SystemFontDialog (wxWindow* parent) int n = 0; for (auto i: _fonts) { - _list->InsertItem (n++, std_to_wx (i.leaf().stem().string ())); + _list->InsertItem(n++, std_to_wx(i.filename().stem().string())); } auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); |