Merge branch 'main' into v2.17.x

1 files changed, 11 insertions, 9 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 59760be98..8b1f8a038 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -232,6 +232,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	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 ("Дима Агатов"));
 	add_section (_("Tested by"), tested_by);
 
@@ -255,7 +256,7 @@ void
 AboutDialog::add_section (wxString name, wxArrayString credits)
 {
 	static auto first = true;
-	int const N = 4;
+	int const N = 3;
 
 	auto panel = new wxScrolledWindow (_notebook);
 	panel->SetMaxSize (wxSize (-1, 380));
@@ -263,22 +264,23 @@ AboutDialog::add_section (wxString name, wxArrayString credits)
 	panel->SetScrollRate (0, 32);
 	auto overall_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-	vector<wxSizer*> sizers;
-
-	for (int i = 0; i < N; ++i) {
-		sizers.push_back (new wxBoxSizer (wxVERTICAL));
-		overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6);
-	}
-
+	vector<wxString> strings(N);
 	int c = 0;
 	for (size_t i = 0; i < credits.Count(); ++i) {
-		add_label_to_sizer (sizers[c], panel, credits[i], false);
+		strings[c] += credits[i] + wxT("\n");
 		++c;
 		if (c == N) {
 			c = 0;
 		}
 	}
 
+	for (int i = 0; i < N; ++i) {
+		auto label = new wxStaticText(panel, wxID_ANY, strings[i]);
+		auto sizer = new wxBoxSizer(wxVERTICAL);
+		sizer->Add(label);
+		overall_sizer->Add(sizer, 1, wxEXPAND | wxALL, 6);
+	}
+
 	panel->SetSizerAndFit (overall_sizer);
 	_notebook->AddPage (panel, name, first);
 	first = false;