Fixes compatibility with wxWidgets 3.2.4

wxWidgets has introduced a breaking API change with wxWidgets/wxWidgets#23309 This issues is also discussed here: NixOS/nixpkgs#266945 (comment)
audacity · Nov 13, 2023 · 871ad32 · 871ad32
1 parent 23d58d5
commit 871ad32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/libraries/lib-lv2/LV2Ports.h b/libraries/lib-lv2/LV2Ports.h
@@ -170,7 +170,7 @@ class LV2_API LV2ControlPort final : public LV2Port
       bool trigger, bool logarithmic
    )  : LV2Port{ port, index, isInput, symbol, name, group }
       , mScaleValues{ move(scaleValues) }
-      , mScaleLabels{ std::move(scaleLabels) }
+      , mScaleLabels( std::move(scaleLabels) )
       , mUnits{ units }
       , mMin{ min }, mMax{ max }, mDef{ def }
       , mHasLo{ hasLo }, mHasHi{ hasHi }

diff --git a/src/TagsEditor.cpp b/src/TagsEditor.cpp
@@ -1,11 +1,11 @@
 /**********************************************************************
- 
+
  Audacity: A Digital Audio Editor
- 
+
  TagsEditor.cpp
- 
+
  Paul Licameli split from Tags.cpp
- 
+
  **********************************************************************/
 
 #include "TagsEditor.h"
@@ -42,7 +42,7 @@ class ComboEditor final : public wxGridCellChoiceEditor
 public:
    ComboEditor(const wxArrayString& choices, bool allowOthers = false)
    :  wxGridCellChoiceEditor(choices, allowOthers)
-   ,  m_choices{ choices }
+   ,  m_choices( choices )
    ,  m_allowOthers{ allowOthers }
    {
    }

diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
@@ -68,7 +68,7 @@ void GUIPrefs::GetRangeChoices(
    int *pDefaultRangeIndex
 )
 {
-   static const auto sCodes = {
+   static const wxArrayStringEx sCodes = {
       wxT("36") ,
       wxT("48") ,
       wxT("60") ,