Remove use of wxT in favour of char_to_wx().

The wxWidgets docs advise against its use these days.

68 files changed, 348 insertions, 348 deletions

diff --git a/hacks/gl/basic_gl_pane.cc b/hacks/gl/basic_gl_pane.cc
index 565bf4cee..d6b01462f 100644
--- a/hacks/gl/basic_gl_pane.cc
+++ b/hacks/gl/basic_gl_pane.cc
@@ -33,7 +33,7 @@ DrawableThing* sprite;
 bool MyApp::OnInit()
 {
     wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
-    frame = new wxFrame((wxFrame *)NULL, -1,  wxT("Hello GL World"), wxPoint(50,50), wxSize(400,200));
+    frame = new wxFrame((wxFrame *)NULL, -1, char_to_wx("Hello GL World"), wxPoint(50,50), wxSize(400,200));
 
     int args[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, 0};
 
@@ -72,7 +72,7 @@ void BasicGLPane::keyPressed(wxKeyEvent& event) {}
 void BasicGLPane::keyReleased(wxKeyEvent& event) {}
 
 BasicGLPane::BasicGLPane(wxFrame* parent, int* args) :
-wxGLCanvas(parent, wxID_ANY,  wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas"),  args)
+wxGLCanvas(parent, wxID_ANY,  wxDefaultPosition, wxDefaultSize, 0, char_to_wx("GLCanvas"),  args)
 {
 }
 
@@ -150,7 +150,7 @@ void BasicGLPane::render( wxPaintEvent& evt )
 
     if(image == NULL)
     {
-        image = new Image( wxT("myfile.png") );
+        image = new Image(char_to_wx("myfile.png"));
         sprite = new DrawableThing(image);
     }
 
diff --git a/hacks/gl/shader.cc b/hacks/gl/shader.cc
index 8d5f5fe70..c6cdb8593 100644
--- a/hacks/gl/shader.cc
+++ b/hacks/gl/shader.cc
@@ -35,7 +35,7 @@ public:
 	bool OnInit()
 	{
 		auto sizer = new wxBoxSizer(wxHORIZONTAL);
-		_frame = new wxFrame(nullptr, wxID_ANY, wxT("Hello world"));
+		_frame = new wxFrame(nullptr, wxID_ANY, char_to_wx("Hello world"));
 		_canvas = new GLCanvas(_frame);
 		sizer->Add(_canvas->get(), 1, wxEXPAND);
 		_frame->SetSizerAndFit(sizer);
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index cfe66bf52..6dfaaf1a8 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -777,7 +777,7 @@ private:
 	void tools_export_preferences ()
 	{
 		FileDialog dialog(
-			this, _("Specify ZIP file"), wxT("ZIP files (*.zip)|*.zip"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT, "Preferences", string("dcpomatic_config.zip")
+			this, _("Specify ZIP file"), char_to_wx("ZIP files (*.zip)|*.zip"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT, "Preferences", string("dcpomatic_config.zip")
 			);
 
 		if (dialog.ShowModal() == wxID_OK) {
@@ -797,7 +797,7 @@ private:
 
 	void tools_import_preferences()
 	{
-		FileDialog dialog(this, _("Specify ZIP file"), wxT("ZIP files (*.zip)|*.zip"), wxFD_OPEN, "Preferences");
+		FileDialog dialog(this, _("Specify ZIP file"), char_to_wx("ZIP files (*.zip)|*.zip"), wxFD_OPEN, "Preferences");
 
 		if (!dialog.show()) {
 			return;
@@ -1774,18 +1774,18 @@ private:
 	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
+		parser.SetSwitchChars(char_to_wx("-"));
 	}
 
 	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
-		if (parser.Found (wxT("version"))) {
+		if (parser.Found(char_to_wx("version"))) {
 			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		}
 
 		if (parser.GetParamCount() > 0) {
-			if (parser.Found (wxT ("new"))) {
+			if (parser.Found(char_to_wx("new"))) {
 				_film_to_create = wx_to_std (parser.GetParam (0));
 			} else {
 				_film_to_load = wx_to_std (parser.GetParam (0));
@@ -1793,17 +1793,17 @@ private:
 		}
 
 		wxString content;
-		if (parser.Found (wxT ("content"), &content)) {
+		if (parser.Found(char_to_wx("content"), &content)) {
 			_content_to_add = wx_to_std (content);
 		}
 
 		wxString dcp;
-		if (parser.Found (wxT ("dcp"), &dcp)) {
+		if (parser.Found(char_to_wx("dcp"), &dcp)) {
 			_dcp_to_add = wx_to_std (dcp);
 		}
 
 		wxString config;
-		if (parser.Found (wxT("config"), &config)) {
+		if (parser.Found(char_to_wx("config"), &config)) {
 			State::override_path = wx_to_std (config);
 		}
 
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 51d700d20..379a3c074 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -516,7 +516,7 @@ class App : public wxApp
 	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
+		parser.SetSwitchChars(char_to_wx("-"));
 	}
 
 	bool OnCmdLineParsed (wxCmdLineParser& parser) override
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 49ada2580..890f01ad0 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -117,7 +117,7 @@ public:
 		output->AddGrowableCol (1, 1);
 
 		add_label_to_sizer (output, overall_panel, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-		_annotation_text = new wxTextCtrl (overall_panel, wxID_ANY, wxT(""));
+		_annotation_text = new wxTextCtrl(overall_panel, wxID_ANY, {});
 		output->Add (_annotation_text, 1, wxEXPAND);
 
 		add_label_to_sizer (output, overall_panel, _("Output DCP folder"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 235677461..076cf295b 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -81,7 +81,7 @@ class DirDialogWrapper : public wxDirDialog
 {
 public:
 	DirDialogWrapper (wxWindow* parent)
-		: wxDirDialog (parent, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST)
+		: wxDirDialog (parent, _("Choose a DCP folder"), {}, wxDD_DIR_MUST_EXIST)
 	{
 
 	}
@@ -530,15 +530,15 @@ public:
 	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
+		parser.SetSwitchChars(char_to_wx("-"));
 	}
 
 	bool OnCmdLineParsed (wxCmdLineParser& parser) override
 	{
-		_skip_alpha_check = parser.Found(wxT("sure"));
+		_skip_alpha_check = parser.Found(char_to_wx("sure"));
 
 		wxString dcp;
-		if (parser.Found(wxT("dcp"), &dcp)) {
+		if (parser.Found(char_to_wx("dcp"), &dcp)) {
 			_dcp_to_write = wx_to_std (dcp);
 		}
 
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index a42517ffc..3ca314355 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -507,7 +507,7 @@ private:
 	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
+		parser.SetSwitchChars(char_to_wx("-"));
 	}
 
 	bool OnCmdLineParsed (wxCmdLineParser& parser) override
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 909c4e281..64c7ca7e3 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -575,7 +575,7 @@ private:
 
 	void add_dkdm_clicked ()
 	{
-		FileDialog dialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
+		FileDialog dialog(this, _("Select DKDM file"), char_to_wx("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
 		if (!dialog.show()) {
 			return;
 		}
@@ -789,7 +789,7 @@ private:
 		}
 
 		wxFileDialog dialog(
-			this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"),
+			this, _("Select DKDM File"), wxEmptyString, wxEmptyString, char_to_wx("XML files (*.xml)|*.xml"),
 			wxFD_SAVE | wxFD_OVERWRITE_PROMPT
 			);
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 424c3917c..2b4ba41db 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -742,7 +742,7 @@ private:
 
 	void file_add_kdm ()
 	{
-		FileDialog dialog(this, _("Select KDM"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddKDMPath");
+		FileDialog dialog(this, _("Select KDM"), char_to_wx("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddKDMPath");
 
 		if (dialog.show()) {
 			DCPOMATIC_ASSERT (_film);
@@ -905,7 +905,7 @@ private:
 		_viewer.set_pad_black(_mode != Config::PLAYER_MODE_WINDOW);
 
 		if (_mode == Config::PLAYER_MODE_DUAL) {
-			_dual_screen = new wxFrame (this, wxID_ANY, wxT(""));
+			_dual_screen = new wxFrame(this, wxID_ANY, {});
 			_dual_screen->SetBackgroundColour (wxColour(0, 0, 0));
 			_dual_screen->ShowFullScreen (true);
 			_viewer.panel()->Reparent(_dual_screen);
@@ -1342,7 +1342,7 @@ private:
 	void OnInitCmdLine (wxCmdLineParser& parser) override
 	{
 		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
+		parser.SetSwitchChars(char_to_wx("-"));
 	}
 
 	bool OnCmdLineParsed (wxCmdLineParser& parser) override
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 5900467ef..7798c3278 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -375,7 +375,7 @@ public:
 			}
 			_name->SetValue (std_to_wx(_playlist->name()));
 		} else {
-			_name->SetValue (wxT(""));
+			_name->SetValue({});
 		}
 		setup_sensitivity ();
 	}
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 3a3894dae..5747e89af 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -167,14 +167,14 @@ public:
 		auto state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
 
 		add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
-		_fps = new StaticText (this, wxT(""));
+		_fps = new StaticText(this, {});
 		state_sizer->Add (_fps);
 
 		auto log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
 		log_sizer->AddGrowableCol (0, 1);
 
 		wxClientDC dc (this);
-		wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long"));
+		wxSize size = dc.GetTextExtent(char_to_wx("This is the length of the file label it should be quite long"));
 		int const height = (size.GetHeight() + 2) * log_lines;
 		SetSize (700, height + DCPOMATIC_SIZER_GAP * 2);
 
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;
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 80a8b8c71..f0bd80ca0 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -87,19 +87,19 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, FilmViewer& v
 
 	auto left = new wxBoxSizer (wxVERTICAL);
 
-	_cursor = new StaticText (this, wxT("Cursor: none"));
+	_cursor = new StaticText(this, char_to_wx("Cursor: none"));
 	left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 	_plot = new AudioPlot (this, viewer);
 	left->Add (_plot, 1, wxTOP | wxEXPAND, 12);
-	_sample_peak = new StaticText (this, wxT (""));
+	_sample_peak = new StaticText(this, {});
 	left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_true_peak = new StaticText (this, wxT (""));
+	_true_peak = new StaticText(this, {});
 	left->Add (_true_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_integrated_loudness = new StaticText (this, wxT (""));
+	_integrated_loudness = new StaticText(this, {});
 	left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_loudness_range = new StaticText (this, wxT (""));
+	_loudness_range = new StaticText(this, {});
 	left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-	_leqm = new StaticText (this, wxT(""));
+	_leqm = new StaticText(this, {});
 	left->Add (_leqm, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 
 	lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 34923fb02..1d6cba315 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -72,7 +72,7 @@ void
 AudioPanel::create ()
 {
 	_show = new Button (this, _("Show graph of audio levels..."));
-	_peak = new StaticText (this, wxT (""));
+	_peak = new StaticText(this, {});
 
 	_gain_label = create_label (this, _("Gain"), true);
 	_gain = new ContentSpinCtrlDouble<AudioContent> (
@@ -111,7 +111,7 @@ AudioPanel::create ()
 	_mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP"));
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
 
-	_description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize);
+	_description = new StaticText(this, char_to_wx(" \n"), wxDefaultPosition, wxDefaultSize);
 	_sizer->Add (_description, 0, wxALL, 12);
 	auto font = _description->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -316,7 +316,7 @@ AudioPanel::setup_description ()
 {
 	auto ac = _parent->selected_audio ();
 	if (ac.size () != 1) {
-		checked_set (_description, wxT (""));
+		checked_set(_description, wxString{});
 		return;
 	}
 
@@ -434,7 +434,7 @@ AudioPanel::setup_peak ()
 
 	auto peak_dB = peak ();
 	if (sel.size() != 1) {
-		_peak->SetLabel (wxT(""));
+		_peak->SetLabel({});
 	} else {
 		peak_dB = peak ();
 		if (peak_dB) {
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index abd538037..ad478ddd0 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -182,7 +182,7 @@ AudioPlot::paint ()
 	wxDouble db_label_descent;
 	wxDouble db_label_leading;
 	Metrics metrics;
-	gc->GetTextExtent (wxT ("-80dB"), &metrics.db_label_width, &db_label_height, &db_label_descent, &db_label_leading);
+	gc->GetTextExtent(char_to_wx("-80dB"), &metrics.db_label_width, &db_label_height, &db_label_descent, &db_label_leading);
 
 	metrics.db_label_width += 8;
 
@@ -223,7 +223,7 @@ AudioPlot::paint ()
 		tc -= m * 60;
 		int const s = tc;
 
-		auto str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s);
+		auto str = wxString::Format(char_to_wx("%02d:%02d:%02d"), h, m, s);
 		wxDouble str_width;
 		wxDouble str_height;
 		wxDouble str_descent;
diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index 73b221466..34b2aa82e 100644
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -73,7 +73,7 @@ BarcoAlchemyCertificatePanel::do_download ()
 
 	auto error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load_certificate, this, _1, _2));
 	if (error) {
-		_dialog->message()->SetLabel(wxT(""));
+		_dialog->message()->SetLabel({});
 		error_dialog (this, std_to_wx(*error));
 	} else {
 		_dialog->message()->SetLabel (_("Certificate downloaded"));
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 77516fb82..3536f5045 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -81,7 +81,7 @@ ChristieCertificatePanel::do_download ()
 		_dialog->message()->SetLabel (_("Certificate downloaded"));
 		_dialog->setup_sensitivity ();
 	} else {
-		_dialog->message()->SetLabel(wxT(""));
+		_dialog->message()->SetLabel({});
 		error_dialog (this, std_to_wx(*all_errors));
 	}
 }
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 686238c55..d869b51d2 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -82,26 +82,26 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 		_input_power = new wxSpinCtrlDouble (this);
 		s->Add (_input_power, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 		add_label_to_sizer (s, this, _("threshold"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT);
-		_input_threshold = new wxTextCtrl (this, wxID_ANY, wxT (""));
+		_input_threshold = new wxTextCtrl(this, wxID_ANY, {});
 		s->Add (_input_threshold, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 		add_label_to_sizer (s, this, _("A"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT);
-		_input_A = new wxTextCtrl (this, wxID_ANY, wxT (""));
+		_input_A = new wxTextCtrl(this, wxID_ANY, {});
 		s->Add (_input_A, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 		add_label_to_sizer (s, this, _("B"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT);
-		_input_B = new wxTextCtrl (this, wxID_ANY, wxT (""));
+		_input_B = new wxTextCtrl(this, wxID_ANY, {});
 		s->Add (_input_B, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 		table->Add (s, wxGBPosition (r, 1), wxGBSpan (1, 3));
 	}
 	++r;
 
         wxClientDC dc (parent);
-        auto size = dc.GetTextExtent(wxT("-0.12345678901"));
+        auto size = dc.GetTextExtent(char_to_wx("-0.12345678901"));
         size.SetHeight (-1);
 
         wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
         wxArrayString list;
 
-	wxString n (wxT("0123456789-"));
+	auto n = char_to_wx("0123456789-");
 	n.Append(wxNumberFormatter::GetDecimalSeparator());
         for (size_t i = 0; i < n.Length(); ++i) {
                 list.Add (n[i]);
@@ -138,40 +138,40 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 	++r;
 
 	add_label_to_sizer (table, this, _("Red chromaticity"), true, wxGBPosition (r, 0));
-	_red_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_red_x = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_red_x, wxGBPosition (r, 1));
-	_red_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_red_y = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_red_y, wxGBPosition (r, 2));
 	++r;
 
 	add_label_to_sizer (table, this, _("Green chromaticity"), true, wxGBPosition (r, 0));
-	_green_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_green_x = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_green_x, wxGBPosition (r, 1));
-	_green_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_green_y = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_green_y, wxGBPosition (r, 2));
 	++r;
 
 	add_label_to_sizer (table, this, _("Blue chromaticity"), true, wxGBPosition (r, 0));
-	_blue_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_blue_x = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_blue_x, wxGBPosition (r, 1));
-	_blue_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_blue_y = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_blue_y, wxGBPosition (r, 2));
 	++r;
 
 	add_label_to_sizer (table, this, _("White point"), true, wxGBPosition (r, 0));
-	_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_white_x = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_white_x, wxGBPosition (r, 1));
-	_white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_white_y = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_white_y, wxGBPosition (r, 2));
 	++r;
 
-        size = dc.GetTextExtent (wxT ("0.12345678"));
+        size = dc.GetTextExtent(char_to_wx("0.12345678"));
         size.SetHeight (-1);
 
 	auto rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
-			_rgb_to_xyz[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0);
+			_rgb_to_xyz[i][j] = new StaticText(this, {}, wxDefaultPosition, size, 0);
 			rgb_to_xyz_sizer->Add (_rgb_to_xyz[i][j]);
 		}
 	}
@@ -179,29 +179,29 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 
 	/* White point adjustment */
 
-        size = dc.GetTextExtent (wxT ("-0.12345678901"));
+        size = dc.GetTextExtent(char_to_wx("-0.12345678901"));
         size.SetHeight (-1);
 
 	subhead (table, this, _("White point adjustment"), r);
 
 	_adjust_white = new CheckBox (this, _("Adjust white point to"));
 	table->Add (_adjust_white, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	_adjusted_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_adjusted_white_x = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_adjusted_white_x, wxGBPosition (r, 1));
-	_adjusted_white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	_adjusted_white_y = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size, 0, validator);
 	table->Add (_adjusted_white_y, wxGBPosition (r, 2));
 	++r;
 
-	add_label_to_sizer (table, this, wxT (""), false, wxGBPosition (r, 0));
+	add_label_to_sizer(table, this, {}, false, wxGBPosition (r, 0));
 	++r;
 
-        size = dc.GetTextExtent (wxT ("0.12345678"));
+        size = dc.GetTextExtent(char_to_wx("0.12345678"));
         size.SetHeight (-1);
 
 	auto bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
-			_bradford[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0);
+			_bradford[i][j] = new StaticText(this, {}, wxDefaultPosition, size, 0);
 			bradford_sizer->Add (_bradford[i][j]);
 		}
 	}
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 653f868c8..bd8582ea6 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -317,7 +317,7 @@ CertificateChainEditor::CertificateChainEditor (
 	int r = 0;
 
 	add_label_to_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0));
-	_private_key = new StaticText (this, wxT(""));
+	_private_key = new StaticText(this, {});
 	wxFont font = _private_key->GetFont ();
 	font.SetFamily (wxFONTFAMILY_TELETYPE);
 	_private_key->SetFont (font);
@@ -456,7 +456,7 @@ CertificateChainEditor::export_certificate ()
 	}
 
 	auto d = make_wx<wxFileDialog>(
-		this, _("Select Certificate File"), wxEmptyString, default_name, wxT ("PEM files (*.pem)|*.pem"),
+		this, _("Select Certificate File"), wxEmptyString, default_name, char_to_wx("PEM files (*.pem)|*.pem"),
 		wxFD_SAVE | wxFD_OVERWRITE_PROMPT
 		);
 
@@ -486,7 +486,7 @@ void
 CertificateChainEditor::export_chain ()
 {
 	auto d = make_wx<wxFileDialog>(
-		this, _("Select Chain File"), wxEmptyString, wxT("certificate_chain.pem"), wxT("PEM files (*.pem)|*.pem"),
+		this, _("Select Chain File"), wxEmptyString, char_to_wx("certificate_chain.pem"), char_to_wx("PEM files (*.pem)|*.pem"),
 		wxFD_SAVE | wxFD_OVERWRITE_PROMPT
 		);
 
@@ -610,7 +610,7 @@ CertificateChainEditor::export_private_key ()
 	}
 
 	auto d = make_wx<wxFileDialog>(
-		this, _("Select Key File"), wxEmptyString, wxT("private_key.pem"), wxT("PEM files (*.pem)|*.pem"),
+		this, _("Select Key File"), wxEmptyString, char_to_wx("private_key.pem"), char_to_wx("PEM files (*.pem)|*.pem"),
 		wxFD_SAVE | wxFD_OVERWRITE_PROMPT
 		);
 
@@ -728,7 +728,7 @@ void
 KeysPage::export_decryption_chain_and_key ()
 {
 	auto d = make_wx<wxFileDialog>(
-		_panel, _("Select Export File"), wxEmptyString, wxEmptyString, wxT ("DOM files (*.dom)|*.dom"),
+		_panel, _("Select Export File"), wxEmptyString, wxEmptyString, char_to_wx("DOM files (*.dom)|*.dom"),
 		wxFD_SAVE | wxFD_OVERWRITE_PROMPT
 		);
 
@@ -762,7 +762,7 @@ KeysPage::import_decryption_chain_and_key ()
 	}
 
 	auto d = make_wx<wxFileDialog>(
-		_panel, _("Select File To Import"), wxEmptyString, wxEmptyString, wxT ("DOM files (*.dom)|*.dom")
+		_panel, _("Select File To Import"), wxEmptyString, wxEmptyString, char_to_wx("DOM files (*.dom)|*.dom")
 		);
 
 	if (d->ShowModal() != wxID_OK) {
@@ -821,10 +821,10 @@ KeysPage::export_decryption_certificate ()
 	if (!config->dcp_issuer().empty()) {
 		default_name += char_to_wx("_") + std_to_wx(careful_string_filter(config->dcp_issuer()));
 	}
-	default_name += wxT("_kdm_decryption_cert.pem");
+	default_name += char_to_wx("_kdm_decryption_cert.pem");
 
 	auto d = make_wx<wxFileDialog>(
-		_panel, _("Select Certificate File"), wxEmptyString, default_name, wxT("PEM files (*.pem)|*.pem"),
+		_panel, _("Select Certificate File"), wxEmptyString, default_name, char_to_wx("PEM files (*.pem)|*.pem"),
 		wxFD_SAVE | wxFD_OVERWRITE_PROMPT
 		);
 
@@ -864,7 +864,7 @@ SoundPage::setup ()
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 	_sound_output = new wxChoice (_panel, wxID_ANY);
 	s->Add (_sound_output, 0);
-	_sound_output_details = new wxStaticText (_panel, wxID_ANY, wxT(""));
+	_sound_output_details = new wxStaticText(_panel, wxID_ANY, {});
 	s->Add (_sound_output_details, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, DCPOMATIC_SIZER_X_GAP);
 	table->Add (s, wxGBPosition(r, 1));
 	++r;
diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index f3f59eb52..d78adedea 100644
--- a/src/wx/content_advanced_dialog.cc
+++ b/src/wx/content_advanced_dialog.cc
@@ -64,7 +64,7 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 	int r = 0;
 
 	wxClientDC dc (this);
-	auto size = dc.GetTextExtent (wxT ("A quite long name"));
+	auto size = dc.GetTextExtent(char_to_wx("A quite long name"));
 #ifdef __WXGTK3__
 	size.SetWidth (size.GetWidth() + 64);
 #endif
@@ -85,7 +85,7 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 	} else {
 		video_frame_rate_label = add_label_to_sizer (sizer, this, _("Video frame rate that content was prepared for"), true, wxGBPosition(r, 0));
 	}
-	_video_frame_rate = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, wxNumericPropertyValidator(wxNumericPropertyValidator::Float));
+	_video_frame_rate = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxDefaultSize, 0, wxNumericPropertyValidator(wxNumericPropertyValidator::Float));
 	sizer->Add (_video_frame_rate, wxGBPosition(r, 1));
 	_set_video_frame_rate = new Button (this, _("Set"));
 	_set_video_frame_rate->Enable (false);
@@ -197,7 +197,7 @@ ContentAdvancedDialog::filters_changed(vector<Filter> const& filters)
 optional<double>
 ContentAdvancedDialog::video_frame_rate() const
 {
-	if (_video_frame_rate->GetValue() == wxT("")) {
+	if (_video_frame_rate->GetValue().IsEmpty()) {
 		return {};
 	}
 
@@ -219,7 +219,7 @@ ContentAdvancedDialog::video_frame_rate_changed ()
        /* If the user clicks "set" now, with no frame rate entered, it would unset the video
 	  frame rate in the selected content.  This can't be allowed for some content types.
        */
-       if (_video_frame_rate->GetValue() == wxT("") && (dynamic_pointer_cast<DCPContent>(_content) || dynamic_pointer_cast<FFmpegContent>(_content))) {
+       if (_video_frame_rate->GetValue().IsEmpty() && (dynamic_pointer_cast<DCPContent>(_content) || dynamic_pointer_cast<FFmpegContent>(_content))) {
 	       enable = false;
        }
 
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index ddc155952..ef4e87a80 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -369,11 +369,11 @@ ContentMenu::find_missing ()
 	boost::filesystem::path path;
 
 	if ((ic && !ic->still ()) || dc) {
-		wxDirDialog dialog(nullptr, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST);
+		wxDirDialog dialog(nullptr, _("Choose a folder"), {}, wxDD_DIR_MUST_EXIST);
 		r = dialog.ShowModal();
 		path = wx_to_std(dialog.GetPath());
 	} else {
-		wxFileDialog dialog(nullptr, _("Choose a file"), wxT(""), wxT(""), wxT("*.*"));
+		wxFileDialog dialog(nullptr, _("Choose a file"), {}, {}, char_to_wx("*.*"));
 		r = dialog.ShowModal();
 		path = wx_to_std(dialog.GetPath());
 	}
@@ -406,7 +406,7 @@ ContentMenu::kdm ()
 	auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
 	DCPOMATIC_ASSERT (dcp);
 
-	FileDialog dialog(_parent, _("Select KDM"), wxT("XML files|*.xml|All files|*.*"), 0, "AddKDMPath");
+	FileDialog dialog(_parent, _("Select KDM"), char_to_wx("XML files|*.xml|All files|*.*"), 0, "AddKDMPath");
 
 	if (!dialog.show()) {
 		return;
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index a3a924457..bde1ca339 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -265,7 +265,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
 		_content->DragAcceptFiles (true);
 		s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
 
-		_content->InsertColumn (0, wxT(""));
+		_content->InsertColumn(0, wxString{});
 		_content->SetColumnWidth(0, 2048);
 
 		auto b = new wxBoxSizer (wxVERTICAL);
@@ -609,7 +609,7 @@ ContentPanel::add_file_clicked ()
 	FileDialog dialog(
 		_splitter,
 		_("Choose a file or files"),
-		wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
+		char_to_wx("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
 		wxFD_MULTIPLE | wxFD_CHANGE_DIR,
 		"AddFilesPath",
 		{},
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 4f20bdd02..7a34906dd 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -54,11 +54,11 @@ using namespace dcpomatic;
 ContentView::ContentView (wxWindow* parent)
 	: wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)
 {
-	AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
+	AppendColumn({}, wxLIST_FORMAT_LEFT, 80);
 	/* type */
-	AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
+	AppendColumn({}, wxLIST_FORMAT_LEFT, 80);
 	/* annotation text */
-	AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
+	AppendColumn({}, wxLIST_FORMAT_LEFT, 580);
 }
 
 
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index b6270f91a..21423ff3a 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -70,11 +70,11 @@ Controls::Controls(wxWindow* parent, FilmViewer& viewer, bool editor_controls)
 	, _markers (new MarkersPanel(this, viewer))
 	, _slider (new wxSlider(this, wxID_ANY, 0, 0, 4096))
 	, _viewer (viewer)
-	, _rewind_button (new Button(this, wxT("|<")))
-	, _back_button (new Button(this, wxT("<")))
-	, _forward_button (new Button(this, wxT(">")))
-	, _frame_number (new StaticText(this, wxT("")))
-	, _timecode (new StaticText(this, wxT("")))
+	, _rewind_button(new Button(this, char_to_wx("|<")))
+	, _back_button(new Button(this, char_to_wx("<")))
+	, _forward_button(new Button(this, char_to_wx(">")))
+	, _frame_number(new StaticText(this, {}))
+	, _timecode(new StaticText(this, {}))
 	, _timer (this)
 {
 	_v_sizer = new wxBoxSizer (wxVERTICAL);
@@ -276,14 +276,14 @@ void
 Controls::update_position_label ()
 {
 	if (!_film) {
-		checked_set (_frame_number, wxT("0"));
-		checked_set (_timecode, wxT("0:0:0.0"));
+		checked_set(_frame_number, char_to_wx("0"));
+		checked_set(_timecode, char_to_wx("0:0:0.0"));
 		return;
 	}
 
 	double const fps = _film->video_frame_rate ();
 	/* Count frame number from 1 ... not sure if this is the best idea */
-	checked_set(_frame_number, wxString::Format (wxT("%ld"), lrint(_viewer.position().seconds() * fps) + 1));
+	checked_set(_frame_number, wxString::Format(char_to_wx("%ld"), lrint(_viewer.position().seconds() * fps) + 1));
 	checked_set(_timecode, time_to_timecode(_viewer.position(), fps));
 }
 
diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc
index 9f825785e..a10233a31 100644
--- a/src/wx/custom_scale_dialog.cc
+++ b/src/wx/custom_scale_dialog.cc
@@ -44,9 +44,9 @@ CustomScaleDialog::CustomScaleDialog (wxWindow* parent, dcp::Size initial, dcp::
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 	_ratio = new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, wxNumericPropertyValidator(wxNumericPropertyValidator::Float));
 	s->Add (_ratio, 1, wxRIGHT, 4);
-	add_label_to_sizer (s, this, wxT(":1"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(s, this, char_to_wx(":1"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	add (s);
-	_size_from_ratio = new wxStaticText (this, wxID_ANY, wxT(""));
+	_size_from_ratio = new wxStaticText(this, wxID_ANY, {});
 	add (_size_from_ratio, 1, wxALIGN_CENTER_VERTICAL);
 
 	_size = new wxRadioButton (this, wxID_ANY, _("Set size"));
@@ -54,11 +54,11 @@ CustomScaleDialog::CustomScaleDialog (wxWindow* parent, dcp::Size initial, dcp::
 	s = new wxBoxSizer (wxHORIZONTAL);
 	_width = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(DCPOMATIC_SPIN_CTRL_WIDTH, -1), wxSP_ARROW_KEYS, 1, film_container.width);
 	s->Add (_width, 1, wxRIGHT, 4);
-	add_label_to_sizer (s, this, wxT("x"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(s, this, char_to_wx("x"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	_height = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(DCPOMATIC_SPIN_CTRL_WIDTH, -1), wxSP_ARROW_KEYS, 1, film_container.height);
 	s->Add (_height, 1, wxRIGHT, 4);
 	add (s);
-	_ratio_from_size = new wxStaticText (this, wxID_ANY, wxT(""));
+	_ratio_from_size = new wxStaticText(this, wxID_ANY, {});
 	add (_ratio_from_size, 1, wxALIGN_CENTER_VERTICAL);
 
 	if (custom_ratio) {
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 0cff1e62b..83f37c9de 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -94,7 +94,7 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& viewer)
 	   http://trac.wxwidgets.org/ticket/12539
 	*/
 	_dcp_name = new StaticText (
-		_panel, wxT (""), wxDefaultPosition, wxDefaultSize,
+		_panel, {}, wxDefaultPosition, wxDefaultSize,
 		wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
 		);
 
@@ -104,7 +104,7 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& viewer)
 	_encrypted = new CheckBox (_panel, _("Encrypted"));
 
         wxClientDC dc (_panel);
-        auto size = dc.GetTextExtent (wxT ("GGGGGGGG..."));
+        auto size = dc.GetTextExtent(char_to_wx("GGGGGGGG..."));
         size.SetHeight (-1);
 
 	_standard_label = create_label (_panel, _("Standard"), true);
@@ -482,7 +482,7 @@ DCPPanel::film_changed(FilmProperty p)
 	{
 		auto al = _film->audio_language();
 		checked_set (_enable_audio_language, static_cast<bool>(al));
-		checked_set (_audio_language, al ? std_to_wx(al->to_string()) : wxT(""));
+		checked_set (_audio_language, al ? std_to_wx(al->to_string()) : wxString{});
 		setup_dcp_name ();
 		setup_sensitivity ();
 		_audio_panel_sizer->Layout();
@@ -608,7 +608,7 @@ DCPPanel::set_film (shared_ptr<Film> film)
 
 	if (!_film) {
 		/* Really should all the film_changed below but this might be enough */
-		checked_set (_dcp_name, wxT(""));
+		checked_set(_dcp_name, wxString{});
 		set_general_sensitivity (false);
 		return;
 	}
@@ -802,7 +802,7 @@ DCPPanel::make_video_panel ()
 
 	_container_label = create_label (panel, _("Container"), true);
 	_container = new Choice(panel);
-	_container_size = new StaticText (panel, wxT (""));
+	_container_size = new StaticText(panel, {});
 
 	_resolution_label = create_label (panel, _("Resolution"), true);
 	_resolution = new Choice(panel);
@@ -934,7 +934,7 @@ DCPPanel::make_audio_panel ()
 	add_audio_processors ();
 
 	_enable_audio_language = new CheckBox(panel, _("Language"));
-	_audio_language = new wxStaticText(panel, wxID_ANY, wxT(""));
+	_audio_language = new wxStaticText(panel, wxID_ANY, {});
 	_edit_audio_language = new Button(panel, _("Edit..."));
 
 	_show_audio = new Button (panel, _("Show graph of audio levels..."));
diff --git a/src/wx/dcp_referencing_dialog.cc b/src/wx/dcp_referencing_dialog.cc
index 853391bd3..9b1c61c12 100644
--- a/src/wx/dcp_referencing_dialog.cc
+++ b/src/wx/dcp_referencing_dialog.cc
@@ -126,7 +126,7 @@ DCPReferencingDialog::setup()
 		_dcp_grid->Add(new StaticText(this, std_to_wx(dcp_content->name())), wxGBPosition(row, 0));
 		column = 1;
 		for (auto const& part: all_parts) {
-			record.check_box[part] = new CheckBox(this, wxT(""));
+			record.check_box[part] = new CheckBox(this, {});
 			switch (part) {
 			case Part::VIDEO:
 				record.check_box[part]->set(dcp_content->reference_video());
@@ -149,7 +149,7 @@ DCPReferencingDialog::setup()
 		++row;
 
 		auto add_problem = [this, &row](wxString const& cannot, string why_not) {
-			auto reason = new StaticText(this, cannot + wxT(": ") + std_to_wx(why_not));
+			auto reason = new StaticText(this, cannot + char_to_wx(": ") + std_to_wx(why_not));
 			wxFont font(*wxNORMAL_FONT);
 			font.SetStyle(wxFONTSTYLE_ITALIC);
 			reason->SetFont(font);
diff --git a/src/wx/dcp_text_track_dialog.cc b/src/wx/dcp_text_track_dialog.cc
index d033541d2..caea467d5 100644
--- a/src/wx/dcp_text_track_dialog.cc
+++ b/src/wx/dcp_text_track_dialog.cc
@@ -31,9 +31,9 @@ DCPTextTrackDialog::DCPTextTrackDialog (wxWindow* parent)
 	: TableDialog (parent, _("DCP Text Track"), 2, 1, true)
 {
 	add (_("Name"), true);
-	add (_name = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1)));
+	add (_name = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize(300, -1)));
 	add (_("Language"), true);
-	_language = new LanguageTagWidget (this, wxT(""), boost::none);
+	_language = new LanguageTagWidget(this, {}, boost::none);
 	add (_language->sizer());
 
 	_language->Changed.connect(boost::bind(&DCPTextTrackDialog::set_sensitivity, this));
diff --git a/src/wx/dcp_timeline.cc b/src/wx/dcp_timeline.cc
index f3ccea037..85119dc34 100644
--- a/src/wx/dcp_timeline.cc
+++ b/src/wx/dcp_timeline.cc
@@ -392,7 +392,7 @@ DCPTimeline::paint_reels(wxGraphicsContext* gc)
 		path.AddLineToPoint(to, y);
 		gc->StrokePath(path);
 
-		auto str = wxString::Format(wxT("#%d"), index + 1);
+		auto str = wxString::Format(char_to_wx("#%d"), index + 1);
 		wxDouble str_width;
 		wxDouble str_height;
 		wxDouble str_descent;
diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index a8c09e334..4c2f5d2f2 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -42,7 +42,7 @@ DirPickerCtrl::DirPickerCtrl(wxWindow* parent, bool leaf)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-	_folder = new StaticText(this, wxT(""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+	_folder = new StaticText(this, {}, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
 	wxFont font = _folder->GetFont ();
 	font.SetStyle (wxFONTSTYLE_ITALIC);
 	_folder->SetFont (font);
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 4d8845402..405405175 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -282,7 +282,7 @@ DolbyDoremiCertificatePanel::do_download ()
 		_dialog->message()->SetLabel (_("Certificate downloaded"));
 		_dialog->setup_sensitivity ();
 	} else {
-		_dialog->message()->SetLabel (wxT (""));
+		_dialog->message()->SetLabel({});
 
 		string s;
 		for (auto e: errors) {
diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc
index 350c7487d..53333682c 100644
--- a/src/wx/download_certificate_dialog.cc
+++ b/src/wx/download_certificate_dialog.cc
@@ -48,7 +48,7 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
 	_download = new Button (this, _("Download"));
 	sizer->Add (_download, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
 
-	_message = new StaticText (this, wxT (""));
+	_message = new StaticText(this, {});
 	sizer->Add (_message, 0, wxALL, DCPOMATIC_SIZER_GAP);
 	auto font = _message->GetFont();
 	font.SetStyle (wxFONTSTYLE_ITALIC);
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 3f1509f60..643265927 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -47,7 +47,7 @@ DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* d
 	_overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
 	add_label_to_sizer (_table, this, _("Serial number"), true, 0, wxALIGN_CENTER_VERTICAL);
-	_serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1));
+	_serial = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize (300, -1));
 	_table->Add (_serial, 1, wxEXPAND);
 
 	_serial->Bind (wxEVT_TEXT, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog));
diff --git a/src/wx/email_dialog.cc b/src/wx/email_dialog.cc
index 65fb47473..50fa66dcc 100644
--- a/src/wx/email_dialog.cc
+++ b/src/wx/email_dialog.cc
@@ -32,7 +32,7 @@ EmailDialog::EmailDialog (wxWindow* parent)
 	: TableDialog (parent, _("Email address"), 2, 1, true)
 {
 	add (_("Email address"), true);
-	_email = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(400, -1)));
+	_email = add(new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize(400, -1)));
 
 	layout ();
 
diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 39e7669d5..3511a4497 100644
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -58,7 +58,7 @@ FilePickerCtrl::FilePickerCtrl(
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
         wxClientDC dc (parent);
-        wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long"));
+        wxSize size = dc.GetTextExtent(char_to_wx("This is the length of the file label it should be quite long"));
         size.SetHeight (-1);
 
 	_file = new Button (this, _("(None)"), wxDefaultPosition, size, wxBU_LEFT);
diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index b54841c68..dc1bb5951 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -184,7 +184,7 @@ FontsDialog::set_from_file_clicked ()
         default_dir = char_to_wx("/System/Library/Fonts");
 #endif
 
-	auto d = make_wx<wxFileDialog>(this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf;*.ttc"), wxFD_CHANGE_DIR);
+	auto d = make_wx<wxFileDialog>(this, _("Choose a font file"), default_dir, wxString{}, char_to_wx("*.ttf;*.otf;*.ttc"), wxFD_CHANGE_DIR);
 
 	if (d->ShowModal() != wxID_OK) {
 		return;
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index ec7e9758a..585caa2db 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -191,7 +191,7 @@ private:
 	void export_cinemas_file ()
 	{
 		wxFileDialog dialog(
-			_panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"),
+			_panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, char_to_wx("XML files (*.xml)|*.xml"),
 			wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                 );
 
@@ -1536,7 +1536,7 @@ private:
 		int flags = wxALIGN_TOP | wxTOP | wxLEFT;
 #ifdef __WXOSX__
 		flags |= wxALIGN_RIGHT;
-		text += wxT (":");
+		text += char_to_wx(":");
 #endif
 		wxStaticText* m = new StaticText (parent, text);
 		table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index 62708fd22..5c7ec88ca 100644
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.cc
@@ -33,10 +33,10 @@ GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
 	_processor = add (new wxChoice(this, wxID_ANY));
 
 	add (_("I want to play this back at fader"), true);
-	_wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
+	_wanted = add(new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_NUMERIC)));
 
 	add (_("But I have to use fader"), true);
-	_actual = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
+	_actual = add(new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_NUMERIC)));
 
 	for (auto i: CinemaSoundProcessor::all()) {
 		_processor->Append (std_to_wx(i->name()));
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index 89aa3f44a..7e81c5a60 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -67,7 +67,7 @@ GDCCertificatePanel::do_download ()
 	auto error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1, _2));
 
 	if (error) {
-		_dialog->message()->SetLabel(wxT(""));
+		_dialog->message()->SetLabel({});
 		error_dialog (this, std_to_wx(*error));
 	} else {
 		_dialog->message()->SetLabel (_("Certificate downloaded"));
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index f22141621..65a594ef8 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -55,7 +55,7 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
 
 	_gauge = new wxGauge (this, wxID_ANY, 100);
 	sizer->Add (_gauge, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	_gauge_message = new StaticText (this, wxT(""));
+	_gauge_message = new StaticText(this, {});
 	sizer->Add (_gauge_message, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
 	_text = new wxRichTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (400, 300), wxRE_READONLY);
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index d5b6c4632..4734ccc62 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -67,7 +67,7 @@ JobView::setup ()
 	/* This seems to be required to allow the gauge to shrink under OS X */
 	_gauge->SetMinSize (wxSize (0, -1));
 	_gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
-	_message = new StaticText (_container, wxT(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
+	_message = new StaticText(_container, char_to_wx(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
 	_gauge_message->Add (_message, 1, wxEXPAND | wxALL, 6);
 	_table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
 	++n;
diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index c892c9d48..7b4a12046 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -45,7 +45,7 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 #ifdef __WXGTK3__
 	/* wxDatePickerCtrl is too small with the GTK3 backend so we need to make it bigger with some fudge factors */
 	wxClientDC dc (parent);
-	auto size = dc.GetTextExtent(wxT("99/99/9999"));
+	auto size = dc.GetTextExtent(char_to_wx("99/99/9999"));
 	size.SetWidth (size.GetWidth() * 1.75);
 	size.SetHeight (-1);
 #else
@@ -113,7 +113,7 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 
 	overall_sizer->Add (table, 0, wxTOP, DCPOMATIC_SIZER_GAP);
 
-	_warning = new StaticText (this, wxT(""));
+	_warning = new StaticText(this, {});
 	overall_sizer->Add (_warning, 0, wxTOP, DCPOMATIC_SIZER_GAP);
 	wxFont font = _warning->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -184,7 +184,7 @@ void
 KDMTimingPanel::changed () const
 {
 	if (valid ()) {
-		_warning->SetLabel (wxT (""));
+		_warning->SetLabel({});
 	} else {
 		_warning->SetLabel (_("The 'until' time must be after the 'from' time."));
 	}
diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc
index 2f6ad2b8a..c182a8837 100644
--- a/src/wx/language_tag_widget.cc
+++ b/src/wx/language_tag_widget.cc
@@ -36,7 +36,7 @@ LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, option
 	: _parent (parent)
 	, _sizer (new wxBoxSizer(wxHORIZONTAL))
 {
-	_language = new wxStaticText (parent, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+	_language = new wxStaticText(parent, wxID_ANY, {}, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
 	_language->SetToolTip (tooltip);
 	set (tag);
 
@@ -80,7 +80,7 @@ LanguageTagWidget::set (optional<dcp::LanguageTag> tag)
 	if (tag) {
 		checked_set (_language, std_to_wx(tag->to_string()));
 	} else {
-		checked_set (_language, wxT(""));
+		checked_set(_language, wxString{});
 	}
 }
 
diff --git a/src/wx/make_chain_dialog.cc b/src/wx/make_chain_dialog.cc
index fedff470b..a7888fdb5 100644
--- a/src/wx/make_chain_dialog.cc
+++ b/src/wx/make_chain_dialog.cc
@@ -67,7 +67,7 @@ MakeChainDialog::MakeChainDialog (
 	}
 
 	wxTextValidator validator (wxFILTER_EXCLUDE_CHAR_LIST);
-	validator.SetCharExcludes (wxT ("/"));
+	validator.SetCharExcludes(char_to_wx("/"));
 
 	if (boost::algorithm::starts_with (root_common_name, ".")) {
 		root_common_name = root_common_name.substr (1);
@@ -90,7 +90,7 @@ MakeChainDialog::MakeChainDialog (
 
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (new StaticText (this, wxT (".")), 0, wxALIGN_CENTER_VERTICAL);
+		s->Add (new StaticText (this, char_to_wx(".")), 0, wxALIGN_CENTER_VERTICAL);
 		s->Add (_root_common_name = new wxTextCtrl (
 				this, wxID_ANY, std_to_wx (root_common_name), wxDefaultPosition, wxDefaultSize, 0, validator), 1, wxALIGN_CENTER_VERTICAL
 			);
@@ -101,7 +101,7 @@ MakeChainDialog::MakeChainDialog (
 
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (new StaticText (this, wxT (".")), 0, wxALIGN_CENTER_VERTICAL);
+		s->Add(new StaticText(this, char_to_wx(".")), 0, wxALIGN_CENTER_VERTICAL);
 		s->Add (_intermediate_common_name = new wxTextCtrl (
 				this, wxID_ANY, std_to_wx (intermediate_common_name), wxDefaultPosition, wxDefaultSize, 0, validator), 1, wxALIGN_CENTER_VERTICAL
 			);
@@ -112,7 +112,7 @@ MakeChainDialog::MakeChainDialog (
 
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (new StaticText (this, wxT ("CS.")), 0, wxALIGN_CENTER_VERTICAL);
+		s->Add(new StaticText(this, char_to_wx("CS.")), 0, wxALIGN_CENTER_VERTICAL);
 		s->Add (_leaf_common_name = new wxTextCtrl (
 				this, wxID_ANY, std_to_wx (leaf_common_name), wxDefaultPosition, wxDefaultSize, 0, validator), 1, wxALIGN_CENTER_VERTICAL
 			);
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 304abc9b4..a6a7c5ac9 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -287,7 +287,7 @@ private:
 		int flags = wxALIGN_TOP | wxTOP | wxLEFT;
 #ifdef __WXOSX__
 		flags |= wxALIGN_RIGHT;
-		text += wxT (":");
+		text += char_to_wx(":");
 #endif
 		wxStaticText* m = new StaticText (parent, text);
 		table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index c045d0498..c2d6fa74c 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -58,16 +58,16 @@ PlayerInformation::PlayerInformation(wxWindow* parent, FilmViewer const& viewer)
 		auto s = new wxBoxSizer (wxVERTICAL);
 		add_label_to_sizer(s, this, _("DCP"), false, 0)->SetFont(title_font);
 		for (int i = 0; i < dcp_lines / 2; ++i) {
-			_dcp[i] = add_label_to_sizer(s, this, wxT(""), false, 0);
+			_dcp[i] = add_label_to_sizer(s, this, {}, false, 0);
 		}
 		_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
 	}
 
 	{
 		auto s = new wxBoxSizer (wxVERTICAL);
-		add_label_to_sizer(s, this, wxT(" "), false, 0);
+		add_label_to_sizer(s, this, char_to_wx(" "), false, 0);
 		for (int i = dcp_lines / 2; i < dcp_lines; ++i) {
-			_dcp[i] = add_label_to_sizer(s, this, wxT(""), false, 0);
+			_dcp[i] = add_label_to_sizer(s, this, {}, false, 0);
 		}
 		_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
 	}
@@ -78,9 +78,9 @@ PlayerInformation::PlayerInformation(wxWindow* parent, FilmViewer const& viewer)
 		add_label_to_sizer(s, _kdm_panel, _("KDM"), false, 0)->SetFont(title_font);
 		auto g = new wxGridBagSizer(0, DCPOMATIC_SIZER_GAP);
 		add_label_to_sizer(g, _kdm_panel, _("Valid from"), true, wxGBPosition(0, 0));
-		_kdm_from = add_label_to_sizer(g, _kdm_panel, wxT(""), false, wxGBPosition(0, 1));
+		_kdm_from = add_label_to_sizer(g, _kdm_panel, {}, false, wxGBPosition(0, 1));
 		add_label_to_sizer(g, _kdm_panel, _("Valid to"), true, wxGBPosition(1, 0));
-		_kdm_to = add_label_to_sizer(g, _kdm_panel, wxT(""), false, wxGBPosition(1, 1));
+		_kdm_to = add_label_to_sizer(g, _kdm_panel, {}, false, wxGBPosition(1, 1));
 		s->Add(g, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 		_kdm_panel->SetSizer(s);
 		_sizer->Add(_kdm_panel, 1, wxEXPAND | wxALL, 6);
@@ -89,8 +89,8 @@ PlayerInformation::PlayerInformation(wxWindow* parent, FilmViewer const& viewer)
 	{
 		auto s = new wxBoxSizer (wxVERTICAL);
 		add_label_to_sizer(s, this, _("Performance"), false, 0)->SetFont(title_font);
-		_dropped = add_label_to_sizer(s, this, wxT(""), false, 0);
-		_decode_resolution = add_label_to_sizer(s, this, wxT(""), false, 0);
+		_dropped = add_label_to_sizer(s, this, {}, false, 0);
+		_decode_resolution = add_label_to_sizer(s, this, {}, false, 0);
 		_sizer->Add (s, 2, wxEXPAND | wxALL, 6);
 	}
 
@@ -125,9 +125,9 @@ PlayerInformation::triggered_update ()
 	if (!dcp) {
 		checked_set (_dcp[0], _("No DCP loaded."));
 		for (int r = 1; r < dcp_lines; ++r) {
-			checked_set (_dcp[r], wxT(""));
+			checked_set(_dcp[r], "");
 		}
-		checked_set (_decode_resolution, wxT(""));
+		checked_set(_decode_resolution, "");
 		_kdm_panel->Hide();
 		return;
 	}
diff --git a/src/wx/playhead_to_frame_dialog.cc b/src/wx/playhead_to_frame_dialog.cc
index b4c4b1030..e307fa6b1 100644
--- a/src/wx/playhead_to_frame_dialog.cc
+++ b/src/wx/playhead_to_frame_dialog.cc
@@ -30,7 +30,7 @@ PlayheadToFrameDialog::PlayheadToFrameDialog (wxWindow* parent, DCPTime time, in
 	, _fps (fps)
 {
 	add (_("Go to"), true);
-	_frame = add (new wxTextCtrl (this, wxID_ANY, wxT ("")));
+	_frame = add(new wxTextCtrl(this, wxID_ANY, {}));
 	_frame->SetFocus ();
 	_frame->SetValue (std_to_wx(locale_convert<string>(time.frames_round(fps) + 1)));
 	_frame->SetSelection (-1, -1);
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 171b5a830..ce6cb87e0 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -69,7 +69,7 @@ PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer)
 	_button_sizer->Add (_next_button, 0, wxEXPAND);
 
 	_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
+	_spl_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 740);
 
 	auto left_sizer = new wxBoxSizer(wxVERTICAL);
 	auto e_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -104,8 +104,8 @@ PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer)
 	left_sizer->Add (_content_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
 	_current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500);
-	_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
+	_current_spl_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 500);
+	_current_spl_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 80);
 	e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 	e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
diff --git a/src/wx/qube_certificate_panel.cc b/src/wx/qube_certificate_panel.cc
index a9da29fdf..de8fa8a49 100644
--- a/src/wx/qube_certificate_panel.cc
+++ b/src/wx/qube_certificate_panel.cc
@@ -69,7 +69,7 @@ QubeCertificatePanel::do_download ()
 	}
 
 	if (!name) {
-		_dialog->message()->SetLabel(wxT(""));
+		_dialog->message()->SetLabel({});
 		error_dialog (this, wxString::Format(_("Could not find serial number %s"), std_to_wx(serial).data()));
 		return;
 	}
@@ -77,7 +77,7 @@ QubeCertificatePanel::do_download ()
 	auto error = get_from_url (String::compose("%1SMPTE-%2/%3", base, _type, *name), true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1, _2));
 
 	if (error) {
-		_dialog->message()->SetLabel(wxT(""));
+		_dialog->message()->SetLabel({});
 		error_dialog (this, std_to_wx(*error));
 	} else {
 		_dialog->message()->SetLabel (_("Certificate downloaded"));
diff --git a/src/wx/rating_dialog.cc b/src/wx/rating_dialog.cc
index 691a7d16d..083c927c7 100644
--- a/src/wx/rating_dialog.cc
+++ b/src/wx/rating_dialog.cc
@@ -126,9 +126,9 @@ StandardRatingDialogPage::StandardRatingDialogPage (wxNotebook* notebook)
 #endif
 
 	_found_systems_view = new wxListView (this, wxID_ANY, wxDefaultPosition, wxSize(600, 400), wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER);
-	_found_systems_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 150);
-	_found_systems_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 50);
-	_found_systems_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 400);
+	_found_systems_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 150);
+	_found_systems_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 50);
+	_found_systems_view->AppendColumn({}, wxLIST_FORMAT_LEFT, 400);
 	_rating = new wxChoice (this, wxID_ANY);
 
 	auto sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -286,8 +286,8 @@ CustomRatingDialogPage::CustomRatingDialogPage (wxNotebook* notebook)
 {
 	auto sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-	_agency = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(400, -1));
-	_rating = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(400, -1));
+	_agency = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize(400, -1));
+	_rating = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize(400, -1));
 
 	add_label_to_sizer (sizer, this, _("Agency"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
 	sizer->Add (_agency, 1, wxEXPAND);
diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index 992c88362..79856d66e 100644
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -96,12 +96,12 @@ RecipientDialog::RecipientDialog (
 	auto font = _name->GetFont ();
 	font.SetFamily (wxFONTFAMILY_TELETYPE);
 	dc.SetFont (font);
-	auto size = dc.GetTextExtent(wxT("1234567890123456789012345678"));
+	auto size = dc.GetTextExtent(char_to_wx("1234567890123456789012345678"));
 	size.SetHeight (-1);
 
 	add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0));
 	auto s = new wxBoxSizer (wxHORIZONTAL);
-	_recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size);
+	_recipient_thumbprint = new StaticText(this, {}, wxDefaultPosition, size);
 	_recipient_thumbprint->SetFont (font);
 	set_recipient (recipient);
 	_get_recipient_from_file = new Button (this, _("Get from file..."));
diff --git a/src/wx/region_subtag_widget.cc b/src/wx/region_subtag_widget.cc
index d2c99762a..c9556cba9 100644
--- a/src/wx/region_subtag_widget.cc
+++ b/src/wx/region_subtag_widget.cc
@@ -37,7 +37,7 @@ RegionSubtagWidget::RegionSubtagWidget(wxWindow* parent, wxString tooltip, optio
 	: _parent(parent)
 	, _sizer(new wxBoxSizer(wxHORIZONTAL))
 {
-	_region = new wxStaticText(parent, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+	_region = new wxStaticText(parent, wxID_ANY, {}, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
 	_region->SetToolTip(tooltip);
 	set(tag);
 
@@ -75,7 +75,7 @@ RegionSubtagWidget::set(optional<dcp::LanguageTag::RegionSubtag> tag)
 	if (tag) {
 		checked_set(_region, std_to_wx(tag->subtag()));
 	} else {
-		checked_set(_region, wxT(""));
+		checked_set(_region, std::string{});
 	}
 }
 
diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 701f9dc21..226a44d0a 100644
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -61,12 +61,12 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
 	int flags = wxALIGN_TOP | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
 	flags |= wxALIGN_RIGHT;
-	t += wxT (":");
+	t += char_to_wx(":");
 #endif
 	auto m = new StaticText (this, t);
 	_table->Add (m, 1, flags, 6);
 
-	_summary = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(320, 240), wxTE_MULTILINE);
+	_summary = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize(320, 240), wxTE_MULTILINE);
 	_table->Add (_summary, 1, wxEXPAND | wxALIGN_TOP);
 
 	_send_logs = new CheckBox (this, _("Send logs"));
@@ -75,7 +75,7 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
 	_table->AddSpacer (0);
 
 	add_label_to_sizer (_table, this, _("Your email address"), true, 0, wxALIGN_CENTRE_VERTICAL);
-	_email = new wxTextCtrl (this, wxID_ANY, wxT (""));
+	_email = new wxTextCtrl(this, wxID_ANY, {});
 	_email->SetValue (std_to_wx (Config::instance()->kdm_from ()));
 	_table->Add (_email, 1, wxEXPAND);
 
@@ -97,7 +97,7 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
 		}
 	}
 
-	auto n = new StaticText (this, wxT(""));
+	auto n = new StaticText(this, {});
 	n->SetLabelMarkup (out);
 	_table->AddSpacer (0);
 	_table->Add (n, 1, wxEXPAND);
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 0040ac31b..d0cf499e9 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -53,7 +53,7 @@ public:
 		: TableDialog (parent, _("Trusted Device"), 3, 1, true)
 	{
 		add (_("Thumbprint"), true);
-		_thumbprint = add(new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1), wxTE_READONLY));
+		_thumbprint = add(new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxSize(300, -1), wxTE_READONLY));
 		_file = add (new Button(this, _("Load certificate...")));
 
 		layout ();
@@ -164,7 +164,7 @@ ScreenDialog::ScreenDialog (
 
 	auto add_certificate_detail = [&r, this](wxString name, wxStaticText** value, wxSize size = wxDefaultSize) {
 		add_label_to_sizer(_sizer, this, name, true, wxGBPosition(r, 0), wxDefaultSpan, true);
-		*value = new StaticText(this, wxT (""), wxDefaultPosition, size);
+		*value = new StaticText(this, {}, wxDefaultPosition, size);
 		_sizer->Add(*value, wxGBPosition(r, 1));
 		++r;
 	};
@@ -173,14 +173,14 @@ ScreenDialog::ScreenDialog (
 	wxFont teletype_font = _name->GetFont();
 	teletype_font.SetFamily(wxFONTFAMILY_TELETYPE);
 	dc.SetFont(teletype_font);
-        wxSize size = dc.GetTextExtent (wxT("1234567890123456789012345678"));
+        wxSize size = dc.GetTextExtent(char_to_wx("1234567890123456789012345678"));
         size.SetHeight (-1);
 
 	add_certificate_detail(_("Thumbprint"), &_recipient_thumbprint, size);
 	_recipient_thumbprint->SetFont(teletype_font);
 
 	add_label_to_sizer(_sizer, this, _("Filename"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
-	_recipient_file = new wxStaticText(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(600, -1), wxST_ELLIPSIZE_MIDDLE | wxST_NO_AUTORESIZE);
+	_recipient_file = new wxStaticText(this, wxID_ANY, {}, wxDefaultPosition, wxSize(600, -1), wxST_ELLIPSIZE_MIDDLE | wxST_NO_AUTORESIZE);
 	set_recipient_file(recipient_file.get_value_or(""));
 	_sizer->Add (_recipient_file, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
 	++r;
@@ -198,7 +198,7 @@ ScreenDialog::ScreenDialog (
 		int flags = wxALIGN_CENTER_VERTICAL | wxTOP;
 #ifdef __WXOSX__
 		flags |= wxALIGN_RIGHT;
-		auto m = new StaticText (this, _("Other trusted devices") + wxT(":"));
+		auto m = new StaticText (this, _("Other trusted devices") + char_to_wx(":"));
 #else
 		auto m = new StaticText (this, _("Other trusted devices"));
 #endif
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 4099f2fe3..755132ef1 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -70,7 +70,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
 	auto targets = new wxBoxSizer (wxHORIZONTAL);
 	_targets = new wxTreeListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER);
-	_targets->AppendColumn (wxT("foo"));
+	_targets->AppendColumn(char_to_wx("foo"));
 
 	targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 5761222c6..ef03609ba 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -31,14 +31,14 @@ ServerDialog::ServerDialog (wxWindow* parent)
 {
         wxClientDC dc (parent);
 	/* XXX: bit of a mystery why we need such a long string here */
-        wxSize size = dc.GetTextExtent (wxT ("255.255.255.255.255.255.255.255"));
+        wxSize size = dc.GetTextExtent(char_to_wx("255.255.255.255.255.255.255.255"));
         size.SetHeight (-1);
 
         wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
         wxArrayString list;
 
 	add (_("Host name or IP address"), true);
-	_host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size));
+	_host = add(new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size));
 
 	layout ();
 
diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc
index 9814ededd..b31b04285 100644
--- a/src/wx/system_font_dialog.cc
+++ b/src/wx/system_font_dialog.cc
@@ -56,7 +56,7 @@ SystemFontDialog::SystemFontDialog (wxWindow* parent)
 	sort (_fonts.begin(), _fonts.end());
 
 	_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_list->InsertColumn (0, wxT (""));
+	_list->InsertColumn(0, wxString{});
 	_list->SetColumnWidth (0, 512);
 	sizer->Add (_list, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
 
diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index c4ad5fff6..7653f8663 100644
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -65,10 +65,10 @@ TableDialog::add (wxString text, bool, int flags)
 #ifdef DCPOMATIC_OSX
 	if (label) {
 		flags |= wxALIGN_RIGHT;
-		text += wxT (":");
+		text += char_to_wx(":");
 	}
 #endif
-	auto m = new StaticText (this, wxT (""));
+	auto m = new StaticText(this, {});
 	m->SetLabelMarkup (text);
 	_table->Add (m, 0, flags, 6);
 	return m;
diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 8016f79f5..acdca1301 100644
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -52,14 +52,14 @@ TimePickerSpin::TimePickerSpin (wxWindow* parent, wxDateTime time)
 	: TimePicker (parent)
 {
 	wxClientDC dc (parent);
-	wxSize size = dc.GetTextExtent (wxT ("9999999"));
+	wxSize size = dc.GetTextExtent(char_to_wx("9999999"));
 	size.SetHeight (-1);
 
 	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
-	_hours = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+	_hours = new wxSpinCtrl(this, wxID_ANY, {}, wxDefaultPosition, size);
 	sizer->Add (_hours, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	sizer->Add (new StaticText(this, wxT(":")), 0, wxALIGN_CENTER_VERTICAL);
-	_minutes = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+	sizer->Add(new StaticText(this, char_to_wx(":")), 0, wxALIGN_CENTER_VERTICAL);
+	_minutes = new wxSpinCtrl(this, wxID_ANY, {}, wxDefaultPosition, size);
 	sizer->Add (_minutes, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 
 	SetSizerAndFit (sizer);
@@ -101,14 +101,14 @@ TimePickerText::TimePickerText (wxWindow* parent, wxDateTime time)
 	: TimePicker (parent)
 {
 	wxClientDC dc (parent);
-	wxSize size = dc.GetTextExtent (wxT("99999"));
+	wxSize size = dc.GetTextExtent(char_to_wx("99999"));
 	size.SetHeight (-1);
 
 	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
-	_hours = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+	_hours = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size);
 	sizer->Add (_hours, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-	sizer->Add (new StaticText (this, wxT (":")), 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 4);
-	_minutes = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
+	sizer->Add(new StaticText(this, char_to_wx(":")), 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 4);
+	_minutes = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, size);
 	sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 	SetSizerAndFit (sizer);
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 64fe87190..42491c48e 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -37,7 +37,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 	wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
 	wxArrayString list;
 
-	wxString n (wxT ("0123456789"));
+	auto n = char_to_wx("0123456789");
 	for (size_t i = 0; i < n.Length(); ++i) {
 		list.Add (n[i]);
 	}
@@ -50,13 +50,13 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 
 	_editable = new wxPanel (this);
 	auto editable_sizer = new wxBoxSizer (wxHORIZONTAL);
-	_hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
+	_hours = new wxTextCtrl(_editable, wxID_ANY, {}, wxDefaultPosition, s, 0, validator);
 	controls.push_back(_hours);
-	_minutes = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
+	_minutes = new wxTextCtrl(_editable, wxID_ANY, {}, wxDefaultPosition, s, 0, validator);
 	controls.push_back(_minutes);
-	_seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
+	_seconds = new wxTextCtrl(_editable, wxID_ANY, {}, wxDefaultPosition, s, 0, validator);
 	controls.push_back(_seconds);
-	_frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator);
+	_frames = new wxTextCtrl(_editable, wxID_ANY, {}, wxDefaultPosition, s, 0, validator);
 	controls.push_back(_frames);
 
 	if (parent->GetLayoutDirection() == wxLayout_RightToLeft) {
@@ -67,7 +67,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 		(*i)->SetMaxLength(2);
 		editable_sizer->Add(*i);
 		if (std::next(i) != controls.end()) {
-			add_label_to_sizer(editable_sizer, _editable, wxT (":"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+			add_label_to_sizer(editable_sizer, _editable, char_to_wx(":"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
 		}
 	}
 
@@ -78,7 +78,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 	_editable->SetSizerAndFit (editable_sizer);
 	_sizer->Add (_editable);
 
-	_fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	_fixed = add_label_to_sizer(_sizer, this, char_to_wx("42"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
 
 	_hours->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
 	_minutes->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
@@ -103,11 +103,11 @@ TimecodeBase::set_focus ()
 void
 TimecodeBase::clear ()
 {
-	checked_set (_hours, wxT (""));
-	checked_set (_minutes, wxT (""));
-	checked_set (_seconds, wxT (""));
-	checked_set (_frames, wxT (""));
-	checked_set (_fixed, wxT (""));
+	checked_set(_hours, wxString{});
+	checked_set(_minutes, wxString{});
+	checked_set(_seconds, wxString{});
+	checked_set(_frames, wxString{});
+	checked_set(_fixed, wxString{});
 }
 
 void
@@ -128,16 +128,16 @@ TimecodeBase::set_clicked ()
 
 	_ignore_changed = true;
 	if (_hours->GetValue().IsEmpty()) {
-		_hours->SetValue(wxT("0"));
+		_hours->SetValue(char_to_wx("0"));
 	}
 	if (_minutes->GetValue().IsEmpty()) {
-		_minutes->SetValue(wxT("0"));
+		_minutes->SetValue(char_to_wx("0"));
 	}
 	if (_seconds->GetValue().IsEmpty()) {
-		_seconds->SetValue(wxT("0"));
+		_seconds->SetValue(char_to_wx("0"));
 	}
 	if (_frames->GetValue().IsEmpty()) {
-		_frames->SetValue(wxT("0"));
+		_frames->SetValue(char_to_wx("0"));
 	}
 	_ignore_changed = false;
 }
@@ -155,9 +155,9 @@ TimecodeBase::size (wxWindow* parent)
 {
 	wxClientDC dc (parent);
 #ifdef DCPOMATIC_OSX
-	auto size = dc.GetTextExtent(wxT("999"));
+	auto size = dc.GetTextExtent(char_to_wx("999"));
 #else
-	auto size = dc.GetTextExtent(wxT("99999"));
+	auto size = dc.GetTextExtent(char_to_wx("99999"));
 #endif
 	size.SetHeight (-1);
 	return size;
diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index d9b7710c6..de03be2af 100644
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -96,7 +96,7 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 		tc -= m * 60;
 		int const s = tc;
 
-		wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s);
+		wxString str = wxString::Format(char_to_wx("%02d:%02d:%02d"), h, m, s);
 		wxDouble str_width;
 		wxDouble str_height;
 		wxDouble str_descent;
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 3304157e2..6c6638c07 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -78,7 +78,7 @@ TimingPanel::create ()
 	wxSize size = TimecodeBase::size (this);
 
 	for (int i = 0; i < 3; ++i) {
-		_colon[i] = create_label (this, wxT(":"), false);
+		_colon[i] = create_label(this, char_to_wx(":"), false);
 	}
 
 	//// TRANSLATORS: this is an abbreviation for "hours"
diff --git a/src/wx/verify_dcp_progress_panel.cc b/src/wx/verify_dcp_progress_panel.cc
index 4c4ce6883..a99791911 100644
--- a/src/wx/verify_dcp_progress_panel.cc
+++ b/src/wx/verify_dcp_progress_panel.cc
@@ -37,10 +37,10 @@ VerifyDCPProgressPanel::VerifyDCPProgressPanel(wxWindow* parent)
 {
 	auto overall_sizer = new wxBoxSizer(wxVERTICAL);
 
-	_job_name = new wxStaticText(this, wxID_ANY, wxT(""));
+	_job_name = new wxStaticText(this, wxID_ANY, {});
 	overall_sizer->Add(_job_name, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
-	_file_name = new wxStaticText(this, wxID_ANY, wxT(""));
+	_file_name = new wxStaticText(this, wxID_ANY, {});
 	wxFont file_name_font(*wxNORMAL_FONT);
 	file_name_font.SetFamily(wxFONTFAMILY_MODERN);
 	file_name_font.SetPointSize(file_name_font.GetPointSize() - 2);
diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc
index 672bca8e3..9f60a41f4 100644
--- a/src/wx/verify_dcp_result_panel.cc
+++ b/src/wx/verify_dcp_result_panel.cc
@@ -56,7 +56,7 @@ VerifyDCPResultPanel::VerifyDCPResultPanel(wxWindow* parent)
 	_pages[dcp::VerificationNote::Type::WARNING] = new wxRichTextCtrl(notebook, wxID_ANY, wxEmptyString, wxDefaultPosition, {400, 300}, wxRE_READONLY);
 	notebook->AddPage(_pages[dcp::VerificationNote::Type::WARNING], _("Warnings"));
 
-	_summary = new wxStaticText(this, wxID_ANY, wxT(""));
+	_summary = new wxStaticText(this, wxID_ANY, {});
 	sizer->Add(_summary, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 
 	auto save_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -662,7 +662,7 @@ void
 VerifyDCPResultPanel::save_text_report()
 {
 	if (_job) {
-		save<dcp::TextFormatter>(this, wxT("Text files (*.txt)|*.txt"), _job->result());
+		save<dcp::TextFormatter>(this, char_to_wx("Text files (*.txt)|*.txt"), _job->result());
 	}
 }
 
@@ -671,6 +671,6 @@ void
 VerifyDCPResultPanel::save_html_report()
 {
 	if (_job) {
-		save<dcp::HTMLFormatter>(this, wxT("HTML files (*.htm;*html)|*.htm;*.html"), _job->result());
+		save<dcp::HTMLFormatter>(this, char_to_wx("HTML files (*.htm;*html)|*.htm;*.html"), _job->result());
 	}
 }
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 65f381fe3..06de93526 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -125,7 +125,7 @@ VideoPanel::create ()
 
 	auto const link_path = bitmap_path(gui_is_dark() ? "link_white.png" : "link_black.png");
 
-	_left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
+	_left_right_link = new wxToggleButton(this, wxID_ANY, {}, wxDefaultPosition, wxSize(link_width, link_height));
 	_left_right_link->SetBitmap(wxBitmap(link_path, wxBITMAP_TYPE_PNG));
 
 	_right_crop_label = create_label (this, _("Right"), true);
@@ -150,7 +150,7 @@ VideoPanel::create ()
 		boost::bind (&VideoPanel::top_crop_changed, this)
 		);
 
-	_top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
+	_top_bottom_link = new wxToggleButton(this, wxID_ANY, {}, wxDefaultPosition, wxSize(link_width, link_height));
 	_top_bottom_link->SetBitmap(wxBitmap(link_path, wxBITMAP_TYPE_PNG));
 
 	_bottom_crop_label = create_label (this, _("Bottom"), true);
@@ -171,7 +171,7 @@ VideoPanel::create ()
 	_fade_out = new Timecode<ContentTime> (this);
 
 	wxClientDC dc (this);
-	auto size = dc.GetTextExtent (wxT ("A quite long name"));
+	auto size = dc.GetTextExtent(char_to_wx("A quite long name"));
 #ifdef __WXGTK3__
 	size.SetWidth (size.GetWidth() + 64);
 #endif
@@ -198,7 +198,7 @@ VideoPanel::create ()
 	_range->Append (_("Full (JPEG, 0-255)"));
 	_range->Append (_("Video (MPEG, 16-235)"));
 
-	_description = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
+	_description = new StaticText(this, char_to_wx("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
 	auto font = _description->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
 	font.SetPointSize(font.GetPointSize() - 1);
@@ -481,7 +481,7 @@ VideoPanel::setup_description ()
 {
 	auto vc = _parent->selected_video ();
 	if (vc.empty ()) {
-		checked_set (_description, wxT (""));
+		checked_set(_description, wxString{});
 		return;
 	} else if (vc.size() > 1) {
 		checked_set (_description, _("Multiple content selected"));
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 0e3c6cf8c..9ed0d01c7 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -58,9 +58,9 @@ VideoWaveformDialog::VideoWaveformDialog(wxWindow* parent, weak_ptr<const Film>
 	wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
 
 	_component = new wxChoice (this, wxID_ANY);
-	_component->Append (wxT ("X"));
-	_component->Append (wxT ("Y"));
-	_component->Append (wxT ("Z"));
+	_component->Append(char_to_wx("X"));
+	_component->Append(char_to_wx("Y"));
+	_component->Append(char_to_wx("Z"));
 	add_label_to_sizer (controls, this, _("Component"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	controls->Add (_component, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index f6fa93940..ebff68096 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -100,15 +100,15 @@ VideoWaveformPlot::paint ()
 	double label_height;
 	double label_descent;
 	double label_leading;
-	gc->GetTextExtent (wxT ("1024"), &label_width, &label_height, &label_descent, &label_leading);
+	gc->GetTextExtent(char_to_wx("1024"), &label_width, &label_height, &label_descent, &label_leading);
 
 	double extra[3];
 	double w;
-	gc->GetTextExtent (wxT ("0"), &w, &label_height, &label_descent, &label_leading);
+	gc->GetTextExtent(char_to_wx("0"), &w, &label_height, &label_descent, &label_leading);
 	extra[0] = label_width - w;
-	gc->GetTextExtent (wxT ("64"), &w, &label_height, &label_descent, &label_leading);
+	gc->GetTextExtent(char_to_wx("64"), &w, &label_height, &label_descent, &label_leading);
 	extra[1] = label_width - w;
-	gc->GetTextExtent (wxT ("512"), &w, &label_height, &label_descent, &label_leading);
+	gc->GetTextExtent(char_to_wx("512"), &w, &label_height, &label_descent, &label_leading);
 	extra[2] = label_width - w;
 
 	int label_gaps = 2;
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 481ff9447..480acc872 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -69,7 +69,7 @@ create_label (wxWindow* p, wxString t, bool)
 {
 #ifdef __WXOSX__
 	if (left) {
-		t += wxT (":");
+		t += char_to_wx(":");
 	}
 #endif
 	return new StaticText (p, t);
@@ -462,13 +462,13 @@ dcpomatic_setup_i18n()
 	}
 
 #ifdef DCPOMATIC_DEBUG
-	wxFileTranslationsLoader::AddCatalogLookupPathPrefix(wxT("build/src/wx/mo"));
-	wxFileTranslationsLoader::AddCatalogLookupPathPrefix(wxT("build/src/tools/mo"));
+	wxFileTranslationsLoader::AddCatalogLookupPathPrefix(char_to_wx("build/src/wx/mo"));
+	wxFileTranslationsLoader::AddCatalogLookupPathPrefix(char_to_wx("build/src/tools/mo"));
 #endif
 
 	translations->AddStdCatalog();
-	translations->AddCatalog(wxT("libdcpomatic2-wx"));
-	translations->AddCatalog(wxT("dcpomatic2"));
+	translations->AddCatalog(char_to_wx("libdcpomatic2-wx"));
+	translations->AddCatalog(char_to_wx("dcpomatic2"));
 
 	wxTranslations::Set(translations);
 
@@ -505,15 +505,15 @@ dcpomatic_setup_i18n ()
 		   so we rename it to avoid clashes with any other installation
 		   of wxWidgets.
 		*/
-		locale->AddCatalog (wxT ("dcpomatic2-wxstd"));
+		locale->AddCatalog(char_to_wx("dcpomatic2-wxstd"));
 
 		/* Fedora 29 (at least) installs wxstd3.mo instead of wxstd.mo */
-		locale->AddCatalog (wxT ("wxstd3"));
+		locale->AddCatalog(char_to_wx("wxstd3"));
 #endif
 
-		locale->AddCatalog(wxT("wxstd"));
-		locale->AddCatalog(wxT("libdcpomatic2-wx"));
-		locale->AddCatalog(wxT("dcpomatic2"));
+		locale->AddCatalog(char_to_wx("wxstd"));
+		locale->AddCatalog(char_to_wx("libdcpomatic2-wx"));
+		locale->AddCatalog(char_to_wx("dcpomatic2"));
 
 		if (!locale->IsOk()) {
 			delete locale;
@@ -560,7 +560,7 @@ context_translation(char const* s)
 	auto t = wxGetTranslation(wx_s);
 	if (t == wx_s) {
 		/* No translation; strip the context */
-		int c = t.Find (wxT ("|"));
+		int c = t.Find(char_to_wx("|"));
 		if (c != wxNOT_FOUND) {
 			t = t.Mid (c + 1);
 		}
@@ -581,7 +581,7 @@ time_to_timecode (DCPTime t, double fps)
 	int const s = floor (w);
 	w -= s;
 	int const f = lrint (w * fps);
-	return wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f);
+	return wxString::Format(char_to_wx("%02d:%02d:%02d.%02d"), h, m, s, f);
 }