3.2 proposed backports

.cirrus.yml

@@ -8,7 +8,7 @@ env:
   CCACHE_DIR: /tmp/ccache
 
 task:
-  skip: "changesIncludeOnly('appveyor.yml','CMakeLists.txt','.github/**','docs/**','interface/**','include/wx/{msw,osx,qt}/**','src/{msw,osx,qt}/**','build/{cmake,msw,osx}/**')"
+  skip: "changesIncludeOnly('appveyor.yml','CMakeLists.txt','.circleci/**','.github/**','docs/**','interface/**','include/wx/{msw,osx,qt}/**','src/{msw,osx,qt}/**','build/{cmake,msw,osx}/**')"
   name: Cirrus CI / FreeBSD 13 wxGTK 3
   freebsd_instance:
     image_family: freebsd-13-0

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci_mac.yml'
       - '.github/workflows/ci_cmake.yml'
@@ -29,6 +30,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci_mac.yml'
       - '.github/workflows/ci_cmake.yml'

.github/workflows/ci_cmake.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci.yml'
       - '.github/workflows/ci_mac.yml'
@@ -27,6 +28,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci.yml'
       - '.github/workflows/ci_mac.yml'

.github/workflows/ci_mac.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches: [ master ]
     paths-ignore:
+    - '.circleci/**'
     - '.github/ISSUE_TEMPLATE/**'
     - '.github/workflows/ci.yml'
     - '.github/workflows/ci_cmake.yml'
@@ -37,6 +38,7 @@ on:
   pull_request:
     branches: [ master ]
     paths-ignore:
+    - '.circleci/**'
     - '.github/ISSUE_TEMPLATE/**'
     - '.github/workflows/ci.yml'
     - '.github/workflows/ci_cmake.yml'

.github/workflows/ci_mac_xcode.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches: [ master ]
     paths-ignore:
+    - '.circleci/**'
     - '.github/ISSUE_TEMPLATE/**'
     - '.github/workflows/ci.yml'
     - '.github/workflows/ci_cmake.yml'
@@ -37,6 +38,7 @@ on:
   pull_request:
     branches: [ master ]
     paths-ignore:
+    - '.circleci/**'
     - '.github/ISSUE_TEMPLATE/**'
     - '.github/workflows/ci.yml'
     - '.github/workflows/ci_cmake.yml'

.github/workflows/ci_msw.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci.yml'
       - '.github/workflows/ci_cmake.yml'
@@ -29,6 +30,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci.yml'
       - '.github/workflows/ci_cmake.yml'

.github/workflows/ci_msw_cross.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci.yml'
       - '.github/workflows/ci_cmake.yml'
@@ -31,6 +32,7 @@ on:
     branches:
       - 3.2
     paths-ignore:
+      - '.circleci/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/ci.yml'
       - '.github/workflows/ci_cmake.yml'

appveyor.yml

@@ -28,6 +28,7 @@ skip_commits:
     - include/wx/x11/
     - src/x11/
     - '**/*.md'
+    - .circleci/
     - .github/ISSUE_TEMPLATE/
     - .github/workflows/
     - build/tools/before_install.sh

docs/changes.txt

@@ -254,6 +254,7 @@ wxMSW:
 
 - Fix setting locale for wxLANGUAGE_UKRAINIAN (Ulrich Telle, #23210).
 - Don't reset custom wxToolBar background on system colour change (#23386).
+- Fix wxUILocale::GetPreferredUILanguages() under < 10 (Brian Nixon, #23416).
 
 wxOSX:
 

samples/artprov/artbrows.cpp

@@ -196,11 +196,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 
 wxArtBrowserDialog::~wxArtBrowserDialog()
 {
-    const int itemCount = m_list->GetItemCount();
-
-    // item data are set by the ART_ICON macro
-    for ( int i = 0; i < itemCount; ++i )
-        delete reinterpret_cast<wxString*>(m_list->GetItemData(i));
+    DeleteListItemData();
 }
 
 wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
@@ -209,6 +205,14 @@ wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
   return wxSize(size, size);
 }
 
+void wxArtBrowserDialog::DeleteListItemData()
+{
+    const int itemCount = m_list->GetItemCount();
+
+    // item data are set by the ART_ICON macro
+    for ( int i = 0; i < itemCount; ++i )
+        delete reinterpret_cast<wxString*>(m_list->GetItemData(i));
+}
 
 void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 {
@@ -221,6 +225,7 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
     long sel = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
     if (sel < 0) sel = 0;
 
+    DeleteListItemData();
     m_list->DeleteAllItems();
     FillBitmaps(img, m_list, index, client, wxSize(16, 16));
     m_list->AssignImageList(img, wxIMAGE_LIST_SMALL);

samples/artprov/artbrows.h

@@ -34,6 +34,8 @@ class wxArtBrowserDialog : public wxDialog
 
     wxSize GetSelectedBitmapSize() const;
 
+    void DeleteListItemData();
+
     wxListCtrl *m_list;
     wxStaticBitmap *m_canvas;
     wxStaticText *m_text;

src/msw/uilocale.cpp

@@ -456,7 +456,7 @@ class wxUILocaleImplName : public wxUILocaleImpl
             {
                 // Use the default user locale for Windows 7 resp Windows 8.x and below
                 wchar_t buf[LOCALE_NAME_MAX_LENGTH];
-                if (!ms_GetUserDefaultLocaleName(buf, LOCALE_NAME_MAX_LENGTH))
+                if (ms_GetUserDefaultLocaleName(buf, LOCALE_NAME_MAX_LENGTH))
                 {
                     preferred.push_back(buf);
                 }