From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Jul 2021 02:02:19 +0200 Subject: Use dcp::compose rather than our own. --- src/wx/about_dialog.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/wx/about_dialog.cc') 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 DCPOMATIC_DISABLE_WARNINGS #include #include @@ -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)); -- cgit v1.2.3