diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/wx/about_dialog.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/wx/about_dialog.cc')
| -rw-r--r-- | src/wx/about_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 73c569282..3a2558f14 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -26,8 +26,8 @@ #include "wx_util.h" #include "static_text.h" #include "lib/version.h" -#include "lib/compose.hpp" #include "lib/warnings.h" +#include <dcp/compose.h> DCPOMATIC_DISABLE_WARNINGS #include <wx/notebook.h> #include <wx/hyperlink.h> @@ -57,9 +57,9 @@ AboutDialog::AboutDialog (wxWindow* parent) wxString s; if (strcmp (dcpomatic_git_commit, "release") == 0) { - t = new StaticText (this, std_to_wx(String::compose("Version %1", dcpomatic_version))); + t = new StaticText (this, std_to_wx(dcp::compose("Version %1", dcpomatic_version))); } else { - t = new StaticText (this, std_to_wx(String::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit))); + t = new StaticText (this, std_to_wx(dcp::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit))); } t->SetFont (version_font); sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2)); |