Merge branch 'main' into v2.17.x

3 files changed, 13 insertions, 9 deletions

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 78b6469a0..700683bd2 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -137,7 +137,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 	_views = v;
 
 	int const N = _cpl_menu->GetMenuItemCount();
-	for (int i = 1; i <= N; ++i) {
+	for (int i = DCPOMATIC_CPL_MENU; i < DCPOMATIC_CPL_MENU + N; ++i) {
 		_cpl_menu->Delete (i);
 	}
 
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index c24871f39..66dbae63e 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -1938,7 +1938,7 @@ create_full_config_dialog ()
 	   the containing window doesn't shrink too much when we select those panels.
 	   This is obviously an unpleasant hack.
 	*/
-	wxSize ps = wxSize (750, -1);
+	wxSize ps = wxSize(900, -1);
 	int const border = 16;
 #else
 	wxSize ps = wxSize (-1, -1);
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index e4e5cb07a..beb4d967a 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -160,6 +160,7 @@ supported_by.Add (wxT ("Marco Valerio Caminiti"));
 supported_by.Add (wxT ("Lachlan Campbell"));
 supported_by.Add (wxT ("Edward Campos"));
 supported_by.Add (wxT ("Luis Canau"));
+supported_by.Add (wxT ("Francesco Cappellini"));
 supported_by.Add (wxT ("Paul Carey"));
 supported_by.Add (wxT ("P. G. Carmona"));
 supported_by.Add (wxT ("Kevin Carney"));
@@ -203,7 +204,7 @@ supported_by.Add (wxT ("Grand Illusion Cinema"));
 supported_by.Add (wxT ("Flathead Lake International Cinemafest"));
 supported_by.Add (wxT ("Leduc Cinemas"));
 supported_by.Add (wxT ("Cinematic"));
-supported_by.Add (wxT ("Zach & Zach Cinérgie"));
+supported_by.Add (wxT ("Zach && Zach Cinérgie"));
 supported_by.Add (wxT ("Cinestudio"));
 supported_by.Add (wxT ("Cinema Clarici"));
 supported_by.Add (wxT ("Berendina Clason"));
@@ -231,7 +232,7 @@ supported_by.Add (wxT ("Tom Cowan"));
 supported_by.Add (wxT ("Jill Cox"));
 supported_by.Add (wxT ("Stefano Cravero"));
 supported_by.Add (wxT ("Phillip Crawford"));
-supported_by.Add (wxT ("Root & Rust Creative"));
+supported_by.Add (wxT ("Root && Rust Creative"));
 supported_by.Add (wxT ("Caribbean Creativity"));
 supported_by.Add (wxT ("Ailis Cross-Gorman"));
 supported_by.Add (wxT ("Rodrigo Hernández Cruz"));
@@ -362,6 +363,7 @@ supported_by.Add (wxT ("KulturKino Feuchtwangen"));
 supported_by.Add (wxT ("Lorenzo Fiale"));
 supported_by.Add (wxT ("Dean Fick"));
 supported_by.Add (wxT ("Marc Fiebig"));
+supported_by.Add (wxT ("Moshel Film"));
 supported_by.Add (wxT ("Juli Film"));
 supported_by.Add (wxT ("Pató Film"));
 supported_by.Add (wxT ("Hoppe Film"));
@@ -370,7 +372,7 @@ supported_by.Add (wxT ("Hamann Film"));
 supported_by.Add (wxT ("Traverse City Film Festival"));
 supported_by.Add (wxT ("Z-fest Film Project"));
 supported_by.Add (wxT ("DIAMETRALE  Filmfestival"));
-supported_by.Add (wxT ("Lichtwerk & Kamera Filmkunst"));
+supported_by.Add (wxT ("Lichtwerk && Kamera Filmkunst"));
 supported_by.Add (wxT ("Casablanca Filmkunsttheater"));
 supported_by.Add (wxT ("Redscope Filmproducties"));
 supported_by.Add (wxT ("Lukas Thiele Filmproduktion"));
@@ -732,14 +734,14 @@ supported_by.Add (wxT ("Juan Marin Lorenzo"));
 supported_by.Add (wxT ("Tim Lorge"));
 supported_by.Add (wxT ("Thomas Lorin"));
 supported_by.Add (wxT ("Leonard Louder"));
-supported_by.Add (wxT ("Auguste & Louise"));
+supported_by.Add (wxT ("Auguste && Louise"));
 supported_by.Add (wxT ("Cubic Films Pty Ltd"));
 supported_by.Add (wxT ("First And Only Ltd"));
 supported_by.Add (wxT ("Quiet Heart Film PTY LTD"));
 supported_by.Add (wxT ("The Digital Picture House Ltd"));
 supported_by.Add (wxT ("Futurilla Ltd"));
 supported_by.Add (wxT ("Sector Zero Ltd"));
-supported_by.Add (wxT ("Lewis & Coleman Consulting Services Pty Ltd"));
+supported_by.Add (wxT ("Lewis && Coleman Consulting Services Pty Ltd"));
 supported_by.Add (wxT ("Keen i Media Ltd"));
 supported_by.Add (wxT ("Ted Lubin"));
 supported_by.Add (wxT ("Michael Luce"));
@@ -770,7 +772,7 @@ supported_by.Add (wxT ("MantaRay.Media"));
 supported_by.Add (wxT ("Maxim Mantel"));
 supported_by.Add (wxT ("Nick Manting-Brewer"));
 supported_by.Add (wxT ("Marc Levy from The Marcs"));
-supported_by.Add (wxT ("Job, Joris & Marieke"));
+supported_by.Add (wxT ("Job, Joris && Marieke"));
 supported_by.Add (wxT ("Stoyan Marinov"));
 supported_by.Add (wxT ("Ruben Marques"));
 supported_by.Add (wxT ("Francisco M Ortega Marquez"));
@@ -982,6 +984,7 @@ supported_by.Add (wxT ("Kino ist Programm"));
 supported_by.Add (wxT ("Sem Rumo — Projetos Audiovisuais"));
 supported_by.Add (wxT ("ProsetschioPictures"));
 supported_by.Add (wxT ("Ivan Pullman"));
+supported_by.Add (wxT ("Milos Pusic"));
 supported_by.Add (wxT ("John Quackenbush"));
 supported_by.Add (wxT ("Festival De Cinéma De La Ville De Québec"));
 supported_by.Add (wxT ("Arts Quest"));
@@ -1087,7 +1090,7 @@ supported_by.Add (wxT ("Brendan Shoebridge"));
 supported_by.Add (wxT ("Tiffany Sia"));
 supported_by.Add (wxT ("Konstantin V. Sichart"));
 supported_by.Add (wxT ("Atli Sigurjonsson"));
-supported_by.Add (wxT ("Andre & Shannon Silva"));
+supported_by.Add (wxT ("Andre && Shannon Silva"));
 supported_by.Add (wxT ("Daniele Silvestri"));
 supported_by.Add (wxT ("Benjamin Simmons"));
 supported_by.Add (wxT ("Peter Six"));
@@ -1266,6 +1269,7 @@ supported_by.Add (wxT ("Mike Wilde"));
 supported_by.Add (wxT ("Andrew Wilhelm"));
 supported_by.Add (wxT ("Edgar Wilkening"));
 supported_by.Add (wxT ("Maya Willcocks"));
+supported_by.Add (wxT ("Steven Willemin"));
 supported_by.Add (wxT ("Roland Wirtz"));
 supported_by.Add (wxT ("Sean Wirz"));
 supported_by.Add (wxT ("Volker Wischnowski"));