wok-current view audacity/stuff/fix-build-wxWidgets-3.1.6.patch @ rev 25728

Merge wok for both arch and few updates
author Stanislas Leduc <shann@slitaz.org>
date Thu Dec 05 08:39:45 2024 +0000 (9 months ago)
parents
children
line source
1 --- a/src/AudacityApp.cpp
2 +++ b/src/AudacityApp.cpp
3 @@ -991,12 +991,10 @@
4 #define WL(lang,sublang)
5 #endif
6
7 -#if wxCHECK_VERSION(3, 0, 1)
8 +#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6)
9 wxLanguageInfo userLangs[] =
10 {
11 - // Bosnian is defined in wxWidgets already
12 -// { wxLANGUAGE_USER_DEFINED, wxT("bs"), WL(0, SUBLANG_DEFAULT) wxT("Bosnian"), wxLayout_LeftToRight },
13 -
14 + // Included upstream in version 3.1.6
15 { wxLANGUAGE_USER_DEFINED, wxT("eu"), WL(0, SUBLANG_DEFAULT) wxT("Basque"), wxLayout_LeftToRight },
16 };
17 #endif
18 @@ -1317,7 +1315,7 @@
19 //
20 // TODO: The whole Language initialization really need to be reworked.
21 // It's all over the place.
22 -#if wxCHECK_VERSION(3, 0, 1)
23 +#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6)
24 for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
25 {
26 wxLocale::AddLanguage(userLangs[i]);
27 --- a/src/MixerBoard.cpp
28 +++ b/src/MixerBoard.cpp
29 @@ -1314,7 +1314,7 @@
30 wxMemoryDC dc;
31
32 for (const auto &data : table) {
33 - auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
34 + auto bmp = std::make_unique<wxBitmap>(data.bitmap);
35 dc.SelectObject(*bmp);
36 AColor::Bevel(dc, false, bev);
37 mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(