X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcc7fdb689eadbbc0e03e1c41069390a7e60c98e..1afe8c83072c52d957db8a9877ca28011258ecac:/src/msw/settings.cpp

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 280c8dd87c..591b4f7c63 100644
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -127,7 +127,12 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         0,          // MENUBAR (unused)
     };
 
-    if ( index == wxSYS_COLOUR_LISTBOX )
+    if ( index == wxSYS_COLOUR_LISTBOXTEXT)
+    {
+        // there is no standard colour with this index, map to another one
+        index = wxSYS_COLOUR_WINDOWTEXT;
+    }
+    else if ( index == wxSYS_COLOUR_LISTBOX )
     {
         // there is no standard colour with this index, map to another one
         index = wxSYS_COLOUR_WINDOW;
@@ -377,7 +382,13 @@ static const int gs_metricsMap[] =
 #else
     -1,
 #endif
+    // SM_SWAPBUTTON is not available under CE and it doesn't make sense to ask
+    // for it there
+#ifdef SM_SWAPBUTTON
     SM_SWAPBUTTON,
+#else
+    -1,
+#endif
     -1   // wxSYS_DCLICK_MSEC - not available as system metric
 };