Use dcp::compose rather than our own.

[dcpomatic.git] / src / wx / about_dialog.cc

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index fac72ac8af3648581779b28ad74c8fbc0b1f5b4a..3a2558f1493d646d95afa90eb5fa2ae5513fd343 100644 (file)
--- 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));
@@ -97,7 +97,6 @@ AboutDialog::AboutDialog (wxWindow* parent)
        written_by.Add (wxT ("Terrence Meiczinger"));
        written_by.Add (wxT ("Mart Jansink"));
        written_by.Add (wxT ("Ole Laursen"));
-       written_by.Add (wxT ("Jianguo Huang"));
        add_section (_("Written by"), written_by);
 
        wxArrayString with_help_from;
@@ -180,6 +179,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Steve Guttag"));
        tested_by.Add (wxT ("Patrick Haderer"));
        tested_by.Add (wxT ("Bill Hamell"));
+       tested_by.Add (wxT ("Groet Han"));
        tested_by.Add (wxT ("Jonathan Jensen"));
        tested_by.Add (wxT ("Thierry Journet"));
        tested_by.Add (wxT ("Markus Kalb"));