Remove use of wxT in favour of char_to_wx().

The wxWidgets docs advise against its use these days.

1 files changed, 122 insertions, 122 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 6870d3f64..c5b07a3ee 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -84,8 +84,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	{
 		auto h = new wxHyperlinkCtrl(
 			this, wxID_ANY,
-			wxT("dcpomatic.com"),
-			wxT("https://dcpomatic.com")
+			char_to_wx("dcpomatic.com"),
+			char_to_wx("https://dcpomatic.com")
 			);
 		sizer->Add(h, wxSizerFlags().Centre().Border(wxALL, 8));
 	}
@@ -103,67 +103,67 @@ AboutDialog::AboutDialog (wxWindow* parent)
 		_notebook = new wxNotebook (this, wxID_ANY);
 
 		wxArrayString written_by;
-		written_by.Add (wxT ("Carl Hetherington"));
-		written_by.Add (wxT ("Terrence Meiczinger"));
-		written_by.Add (wxT ("Mart Jansink"));
-		written_by.Add (wxT ("Ole Laursen"));
-		written_by.Add (wxT ("Aaron Boxer"));
-		written_by.Add (wxT ("Benjamin Radel"));
+		written_by.Add(char_to_wx("Carl Hetherington"));
+		written_by.Add(char_to_wx("Terrence Meiczinger"));
+		written_by.Add(char_to_wx("Mart Jansink"));
+		written_by.Add(char_to_wx("Ole Laursen"));
+		written_by.Add(char_to_wx("Aaron Boxer"));
+		written_by.Add(char_to_wx("Benjamin Radel"));
 		add_section (_("Written by"), written_by);
 
 		wxArrayString with_help_from;
-		with_help_from.Add (wxT ("David Vignoni"));
-		with_help_from.Add (wxT ("Dennis Couzin"));
-		with_help_from.Add (wxT ("Carsten Kurz"));
-		with_help_from.Add (wxT ("Gérald Maruccia"));
-		with_help_from.Add (wxT ("Julian van Mil"));
-		with_help_from.Add (wxT ("Lilian Lefranc"));
+		with_help_from.Add(char_to_wx("David Vignoni"));
+		with_help_from.Add(char_to_wx("Dennis Couzin"));
+		with_help_from.Add(char_to_wx("Carsten Kurz"));
+		with_help_from.Add(char_to_wx("Gérald Maruccia"));
+		with_help_from.Add(char_to_wx("Julian van Mil"));
+		with_help_from.Add(char_to_wx("Lilian Lefranc"));
 		add_section (_("With help from"), with_help_from);
 
 		wxArrayString translated_by;
-		translated_by.Add (wxT ("Manuel AC"));
-		translated_by.Add (wxT ("Max Aeschlimann"));
-		translated_by.Add (wxT ("Gökhan Aksoy"));
-		translated_by.Add (wxT ("Thiago Andre"));
-		translated_by.Add (wxT ("Felice D'Andrea"));
-		translated_by.Add (wxT ("Németh Áron"));
-		translated_by.Add (wxT ("Grégoire Ausina"));
-		translated_by.Add (wxT ("Tomáš Begeni"));
-		translated_by.Add (wxT ("Fabio \"Zak\" Belli"));
-		translated_by.Add (wxT ("Cherif Ben Brahim"));
-		translated_by.Add (wxT ("Massimiliano Broggi"));
-		translated_by.Add (wxT ("Dan Cohen"));
-		translated_by.Add (wxT ("Akivili Collindort"));
-		translated_by.Add (wxT ("Davide Dall'AraCiao"));
-		translated_by.Add (wxT ("Uwe Dittes"));
-		translated_by.Add (wxT ("Михаил Эпштейн"));
-		translated_by.Add (wxT ("William Fanelli"));
-		translated_by.Add (wxT ("Max M. Fuhlendorf"));
-		translated_by.Add (wxT ("Tomáš Hlaváč"));
-		translated_by.Add (wxT ("Thierry Journet"));
-		translated_by.Add (wxT ("Adam Klotblixt"));
-		translated_by.Add (wxT ("Theo Kooijmans"));
-		translated_by.Add (wxT ("Carsten Kurz"));
-		translated_by.Add (wxT ("Lilian Lefranc"));
-		translated_by.Add (wxT ("Gérald Maruccia"));
-		translated_by.Add (wxT ("Mattias Mattsson"));
-		translated_by.Add (wxT ("Mike Mazur"));
-		translated_by.Add (wxT ("Rob van Nieuwkerk"));
-		translated_by.Add (wxT ("Anders Uhl Pedersen"));
-		translated_by.Add (wxT ("David Perrenoud"));
-		translated_by.Add (wxT ("Olivier Perriere"));
-		translated_by.Add (wxT ("Markus Raab"));
-		translated_by.Add (wxT ("Soleyman Rahmani"));
-		translated_by.Add (wxT ("Tiago Casal Ribeiro"));
-		translated_by.Add (wxT ("Davide Sanvito"));
-		translated_by.Add (wxT ("Marek Skrzelowski"));
-		translated_by.Add (wxT ("Danbo Song"));
-		translated_by.Add (wxT ("Martin Srebotnjak"));
-		translated_by.Add (wxT ("Michał Tomaszewski"));
-		translated_by.Add (wxT ("Igor Voytovich"));
-		translated_by.Add (wxT ("Rov (若文)"));
-		translated_by.Add (wxT ("刘汉源"));
-		translated_by.Add (wxT ("poppinzhang"));
+		translated_by.Add(char_to_wx("Manuel AC"));
+		translated_by.Add(char_to_wx("Max Aeschlimann"));
+		translated_by.Add(char_to_wx("Gökhan Aksoy"));
+		translated_by.Add(char_to_wx("Thiago Andre"));
+		translated_by.Add(char_to_wx("Felice D'Andrea"));
+		translated_by.Add(char_to_wx("Németh Áron"));
+		translated_by.Add(char_to_wx("Grégoire Ausina"));
+		translated_by.Add(char_to_wx("Tomáš Begeni"));
+		translated_by.Add(char_to_wx("Fabio \"Zak\" Belli"));
+		translated_by.Add(char_to_wx("Cherif Ben Brahim"));
+		translated_by.Add(char_to_wx("Massimiliano Broggi"));
+		translated_by.Add(char_to_wx("Dan Cohen"));
+		translated_by.Add(char_to_wx("Akivili Collindort"));
+		translated_by.Add(char_to_wx("Davide Dall'AraCiao"));
+		translated_by.Add(char_to_wx("Uwe Dittes"));
+		translated_by.Add(char_to_wx("Михаил Эпштейн"));
+		translated_by.Add(char_to_wx("William Fanelli"));
+		translated_by.Add(char_to_wx("Max M. Fuhlendorf"));
+		translated_by.Add(char_to_wx("Tomáš Hlaváč"));
+		translated_by.Add(char_to_wx("Thierry Journet"));
+		translated_by.Add(char_to_wx("Adam Klotblixt"));
+		translated_by.Add(char_to_wx("Theo Kooijmans"));
+		translated_by.Add(char_to_wx("Carsten Kurz"));
+		translated_by.Add(char_to_wx("Lilian Lefranc"));
+		translated_by.Add(char_to_wx("Gérald Maruccia"));
+		translated_by.Add(char_to_wx("Mattias Mattsson"));
+		translated_by.Add(char_to_wx("Mike Mazur"));
+		translated_by.Add(char_to_wx("Rob van Nieuwkerk"));
+		translated_by.Add(char_to_wx("Anders Uhl Pedersen"));
+		translated_by.Add(char_to_wx("David Perrenoud"));
+		translated_by.Add(char_to_wx("Olivier Perriere"));
+		translated_by.Add(char_to_wx("Markus Raab"));
+		translated_by.Add(char_to_wx("Soleyman Rahmani"));
+		translated_by.Add(char_to_wx("Tiago Casal Ribeiro"));
+		translated_by.Add(char_to_wx("Davide Sanvito"));
+		translated_by.Add(char_to_wx("Marek Skrzelowski"));
+		translated_by.Add(char_to_wx("Danbo Song"));
+		translated_by.Add(char_to_wx("Martin Srebotnjak"));
+		translated_by.Add(char_to_wx("Michał Tomaszewski"));
+		translated_by.Add(char_to_wx("Igor Voytovich"));
+		translated_by.Add(char_to_wx("Rov (若文)"));
+		translated_by.Add(char_to_wx("刘汉源"));
+		translated_by.Add(char_to_wx("poppinzhang"));
 		add_section (_("Translated by"), translated_by);
 
 		wxArrayString patrons;
@@ -179,70 +179,70 @@ AboutDialog::AboutDialog (wxWindow* parent)
 		add_section (_("Also supported by"), supported_by);
 
 		wxArrayString tested_by;
-		tested_by.Add (wxT ("Manuel AC"));
-		tested_by.Add (wxT ("Trever Anderson"));
-		tested_by.Add (wxT ("Mohamad W. Ali"));
-		tested_by.Add (wxT ("JP Beauviala"));
-		tested_by.Add (wxT ("Mike Blakesley"));
-		tested_by.Add (wxT ("David Booty"));
-		tested_by.Add (wxT ("Antonio Casado"));
-		tested_by.Add (wxT ("Roop Chand"));
-		tested_by.Add (wxT ("Daniel Chauvet"));
-		tested_by.Add (wxT ("Adam Colt"));
-		tested_by.Add (wxT ("John Convertino"));
-		tested_by.Add (wxT ("Daniel Courville"));
-		tested_by.Add (wxT ("Marek Dudzik"));
-		tested_by.Add (wxT ("Andreas Eli"));
-		tested_by.Add (wxT ("Leo Enticknap"));
-		tested_by.Add (wxT ("Jose Angel Velasco Fernandez"));
-		tested_by.Add (wxT ("Maurizio Giampà"));
-		tested_by.Add (wxT ("Luke Granger-Brown"));
-		tested_by.Add (wxT ("Sumit Guha"));
-		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"));
-		tested_by.Add (wxT ("Ada de Kamper"));
-		tested_by.Add (wxT ("Stefan Karner"));
-		tested_by.Add (wxT ("Adam Keay"));
-		tested_by.Add (wxT ("Simon Kesselman"));
-		tested_by.Add (wxT ("Pepijn Klijs"));
-		tested_by.Add (wxT ("Denzil Kriekenbeek"));
-		tested_by.Add (wxT ("Carsten Kurz"));
-		tested_by.Add (wxT ("Bill Lam"));
-		tested_by.Add (wxT ("David Lankes"));
-		tested_by.Add (wxT ("Lilian Lefranc"));
-		tested_by.Add (wxT ("Sebastian Leitner"));
-		tested_by.Add (wxT ("Olivier Lemaire"));
-		tested_by.Add (wxT ("Gavin Lewarne"));
-		tested_by.Add (wxT ("Gérald Maruccia"));
-		tested_by.Add (wxT ("George Mazarakis"));
-		tested_by.Add (wxT ("Mattias Mattsson"));
-		tested_by.Add (wxT ("Will Meadows"));
-		tested_by.Add (wxT ("Brad Miller"));
-		tested_by.Add (wxT ("Ash Mitchell"));
-		tested_by.Add (wxT ("Rob van Nieuwkerk"));
-		tested_by.Add (wxT ("Anders Nordentoft-Madsen"));
-		tested_by.Add (wxT ("Mauro Ottonello"));
-		tested_by.Add (wxT ("Peter Puchner"));
-		tested_by.Add (wxT ("Markus Raab"));
-		tested_by.Add (wxT ("Michael Reckert"));
-		tested_by.Add (wxT ("Greg Rooke"));
-		tested_by.Add (wxT ("Elad Saad"));
-		tested_by.Add (wxT ("Karim Senoucci"));
-		tested_by.Add (wxT ("Hordur Valgardsson"));
-		tested_by.Add (wxT ("Xenophon the Vampire"));
-		tested_by.Add (wxT ("Simon Vannarath"));
-		tested_by.Add (wxT ("Igor Voytovich"));
-		tested_by.Add (wxT ("Andrew Walls"));
-		tested_by.Add (wxT ("Andreas Weiss"));
-		tested_by.Add (wxT ("Paul Willmott"));
-		tested_by.Add (wxT ("Wolfgang Woehl"));
-		tested_by.Add (wxT ("Benno Zwanenburg"));
-		tested_by.Add (wxT ("Дима Агатов"));
+		tested_by.Add(char_to_wx("Manuel AC"));
+		tested_by.Add(char_to_wx("Trever Anderson"));
+		tested_by.Add(char_to_wx("Mohamad W. Ali"));
+		tested_by.Add(char_to_wx("JP Beauviala"));
+		tested_by.Add(char_to_wx("Mike Blakesley"));
+		tested_by.Add(char_to_wx("David Booty"));
+		tested_by.Add(char_to_wx("Antonio Casado"));
+		tested_by.Add(char_to_wx("Roop Chand"));
+		tested_by.Add(char_to_wx("Daniel Chauvet"));
+		tested_by.Add(char_to_wx("Adam Colt"));
+		tested_by.Add(char_to_wx("John Convertino"));
+		tested_by.Add(char_to_wx("Daniel Courville"));
+		tested_by.Add(char_to_wx("Marek Dudzik"));
+		tested_by.Add(char_to_wx("Andreas Eli"));
+		tested_by.Add(char_to_wx("Leo Enticknap"));
+		tested_by.Add(char_to_wx("Jose Angel Velasco Fernandez"));
+		tested_by.Add(char_to_wx("Maurizio Giampà"));
+		tested_by.Add(char_to_wx("Luke Granger-Brown"));
+		tested_by.Add(char_to_wx("Sumit Guha"));
+		tested_by.Add(char_to_wx("Steve Guttag"));
+		tested_by.Add(char_to_wx("Patrick Haderer"));
+		tested_by.Add(char_to_wx("Bill Hamell"));
+		tested_by.Add(char_to_wx("Groet Han"));
+		tested_by.Add(char_to_wx("Jonathan Jensen"));
+		tested_by.Add(char_to_wx("Thierry Journet"));
+		tested_by.Add(char_to_wx("Markus Kalb"));
+		tested_by.Add(char_to_wx("Ada de Kamper"));
+		tested_by.Add(char_to_wx("Stefan Karner"));
+		tested_by.Add(char_to_wx("Adam Keay"));
+		tested_by.Add(char_to_wx("Simon Kesselman"));
+		tested_by.Add(char_to_wx("Pepijn Klijs"));
+		tested_by.Add(char_to_wx("Denzil Kriekenbeek"));
+		tested_by.Add(char_to_wx("Carsten Kurz"));
+		tested_by.Add(char_to_wx("Bill Lam"));
+		tested_by.Add(char_to_wx("David Lankes"));
+		tested_by.Add(char_to_wx("Lilian Lefranc"));
+		tested_by.Add(char_to_wx("Sebastian Leitner"));
+		tested_by.Add(char_to_wx("Olivier Lemaire"));
+		tested_by.Add(char_to_wx("Gavin Lewarne"));
+		tested_by.Add(char_to_wx("Gérald Maruccia"));
+		tested_by.Add(char_to_wx("George Mazarakis"));
+		tested_by.Add(char_to_wx("Mattias Mattsson"));
+		tested_by.Add(char_to_wx("Will Meadows"));
+		tested_by.Add(char_to_wx("Brad Miller"));
+		tested_by.Add(char_to_wx("Ash Mitchell"));
+		tested_by.Add(char_to_wx("Rob van Nieuwkerk"));
+		tested_by.Add(char_to_wx("Anders Nordentoft-Madsen"));
+		tested_by.Add(char_to_wx("Mauro Ottonello"));
+		tested_by.Add(char_to_wx("Peter Puchner"));
+		tested_by.Add(char_to_wx("Markus Raab"));
+		tested_by.Add(char_to_wx("Michael Reckert"));
+		tested_by.Add(char_to_wx("Greg Rooke"));
+		tested_by.Add(char_to_wx("Elad Saad"));
+		tested_by.Add(char_to_wx("Karim Senoucci"));
+		tested_by.Add(char_to_wx("Hordur Valgardsson"));
+		tested_by.Add(char_to_wx("Xenophon the Vampire"));
+		tested_by.Add(char_to_wx("Simon Vannarath"));
+		tested_by.Add(char_to_wx("Igor Voytovich"));
+		tested_by.Add(char_to_wx("Andrew Walls"));
+		tested_by.Add(char_to_wx("Andreas Weiss"));
+		tested_by.Add(char_to_wx("Paul Willmott"));
+		tested_by.Add(char_to_wx("Wolfgang Woehl"));
+		tested_by.Add(char_to_wx("Benno Zwanenburg"));
+		tested_by.Add(char_to_wx("Дима Агатов"));
 		add_section (_("Tested by"), tested_by);
 
 		sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16));
@@ -278,7 +278,7 @@ AboutDialog::add_section (wxString name, wxArrayString credits)
 	vector<wxString> strings(N);
 	int c = 0;
 	for (size_t i = 0; i < credits.Count(); ++i) {
-		strings[c] += credits[i] + wxT("\n");
+		strings[c] += credits[i] + char_to_wx("\n");
 		++c;
 		if (c == N) {
 			c = 0;