diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:59:50 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:59:50 +0200 |
| commit | eb6f689b8e9d982d73612af2ba5ddc7ab021aec8 (patch) | |
| tree | ac58fbabe3e13fa656d19543320b4a42206073dd /src/wx | |
| parent | 8aa25e2ec75dada5f07a3860d668241821056f61 (diff) | |
| parent | 7a9cadc6fe86c74035dd971685b1acdc8f32d3fc (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/supporters.cc | 3 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 374beb656..baeba2da9 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -61,6 +61,7 @@ supported_by.Add (wxT ("BFI National Archive")); supported_by.Add (wxT ("Cristian Arias Arévalo")); supported_by.Add (wxT ("Alex Argoitia")); supported_by.Add (wxT ("Esteban Arrangoiz")); +supported_by.Add (wxT ("The Boscov Theater at GoggleWorks Center for the Arts")); supported_by.Add (wxT ("Gunnar Ásgeir Ásgeirsson")); supported_by.Add (wxT ("Andrea Ashton")); supported_by.Add (wxT ("Georges Asmar")); @@ -273,6 +274,7 @@ supported_by.Add (wxT ("Greg Delmage")); supported_by.Add (wxT ("Diemiruaya Deniran")); supported_by.Add (wxT ("Larin Denis")); supported_by.Add (wxT ("Michael Denner")); +supported_by.Add (wxT ("denverdisc.com")); supported_by.Add (wxT ("Nicholas Deppe")); supported_by.Add (wxT ("Alexey Derevyanko")); supported_by.Add (wxT ("Olivier Dermine")); @@ -553,6 +555,7 @@ supported_by.Add (wxT ("Mason Hunsicker")); supported_by.Add (wxT ("Markus Hüsgen")); supported_by.Add (wxT ("Maurice Huvelin")); supported_by.Add (wxT ("Robin Hyden")); +supported_by.Add (wxT ("IAFilm")); supported_by.Add (wxT ("Dayton Movies Inc")); supported_by.Add (wxT ("Buttons Sound Inc")); supported_by.Add (wxT ("Paramount Twin Inc")); diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 5a91df8fe..65f381fe3 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -100,7 +100,11 @@ VideoPanel::create () int const link_height = 32; #elif defined(DCPOMATIC_OSX) int const crop_width = 56; +#if wxCHECK_VERSION(3, 2, 0) int const link_width = 8 + 15 / dpi_scale_factor(this); +#else + int const link_width = 23; +#endif int const link_height = 28; #else int const crop_width = 56; |