From 441157ae0429b4d9b679b7cc4aad3dfbbf3db63f Mon Sep 17 00:00:00 2001
From: Steve Cornett <21205494+stevecor@users.noreply.github.com>
Date: Fri, 19 Jun 2026 11:27:55 -0700
Subject: [PATCH] Use DarkMode_DarkTheme for wxListBox

use DarkMode_DarkTheme for wxListBox, if available. This improves the appearance of the simple border style
---
 src/msw/listbox.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 3f64ef96b0..7af1075f6a 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -175,8 +175,13 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 void wxListBox::MSWGetDarkModeSupport(MSWDarkModeSupport& support) const
 {
-    support.themeName = L"Explorer";
-    support.themeId = L"ScrollBar";
+    // The default theme does not look good on starting with Windows 11
+    // build 26300.8553. DarkMode_DarkTheme looks OK and was available
+    // starting with Windows 11 build 26200.
+    if ( wxCheckOsVersion(10, 0, 26200) )
+        support.themeName = L"DarkMode_DarkTheme";
+    else
+        wxListBoxBase::MSWGetDarkModeSupport(support);
 }
 
 void wxListBox::MSWUpdateFontOnDPIChange(const wxSize& newDPI)