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