Index: include/wx/settings.h =================================================================== --- include/wx/settings.h (revision 56419) +++ include/wx/settings.h (working copy) @@ -79,6 +79,7 @@ wxSYS_COLOUR_GRADIENTINACTIVECAPTION, wxSYS_COLOUR_MENUHILIGHT, wxSYS_COLOUR_MENUBAR, + wxSYS_COLOUR_LISTBOXTEXT, wxSYS_COLOUR_MAX }; Index: src/gtk/settings.cpp =================================================================== --- src/gtk/settings.cpp (revision 56419) +++ src/gtk/settings.cpp (working copy) @@ -47,7 +47,8 @@ m_colMenuItemHighlight, m_colTooltip, m_colTooltipText, - m_colMenubarBg; + m_colMenubarBg, + m_colListBoxText; wxFont m_fontSystem; }; @@ -68,6 +69,7 @@ gs_objects.m_colTooltipText = wxColour(); gs_objects.m_colMenubarBg = wxColour(); gs_objects.m_fontSystem = wxNullFont; + gs_objects.m_colListBoxText = wxColour(); } // ---------------------------------------------------------------------------- @@ -89,7 +91,8 @@ { wxGTK_FG, wxGTK_BG, - wxGTK_BASE + wxGTK_BASE, + wxGTK_TEXT }; // wxSystemSettings::GetColour() helper: get the colours from a GTK+ @@ -152,6 +155,10 @@ case wxGTK_BASE: gdkColor = def->base[state]; break; + + case wxGTK_TEXT: + gdkColor = def->text[state]; + break; } } @@ -282,6 +289,24 @@ color = gs_objects.m_colListBox; break; + case wxSYS_COLOUR_LISTBOXTEXT: + if (!gs_objects.m_colListBoxText.Ok()) + { + if ( GetColourFromGTKWidget(gdkColor, + wxGTK_LIST, + GTK_STATE_NORMAL, + wxGTK_TEXT) ) + { + gs_objects.m_colListBoxText = wxColour(gdkColor); + } + else + { + gs_objects.m_colListBoxText = GetColour(wxSYS_COLOUR_WINDOWTEXT); + } + } + color = gs_objects.m_colListBoxText; + break; + case wxSYS_COLOUR_MENUTEXT: case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_CAPTIONTEXT: Index: src/mac/classic/settings.cpp =================================================================== --- src/mac/classic/settings.cpp (revision 56419) +++ src/mac/classic/settings.cpp (working copy) @@ -70,6 +70,7 @@ case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_INFOTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: + case wxSYS_COLOUR_LISTBOXTEXT: return *wxBLACK; break ; case wxSYS_COLOUR_HIGHLIGHT: Index: src/mac/carbon/settings.cpp =================================================================== --- src/mac/carbon/settings.cpp (revision 56419) +++ src/mac/carbon/settings.cpp (working copy) @@ -75,6 +75,7 @@ case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_INFOTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: + case wxSYS_COLOUR_LISTBOXTEXT: resultColor = *wxBLACK; break ; Index: src/generic/statusbr.cpp =================================================================== --- src/generic/statusbr.cpp (revision 56419) +++ src/generic/statusbr.cpp (working copy) @@ -194,6 +194,7 @@ { wxPaintDC dc(this); + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); #ifdef __WXGTK20__ // Draw grip first if (HasFlag( wxST_SIZEGRIP )) Index: src/generic/treectlg.cpp =================================================================== --- src/generic/treectlg.cpp (revision 56419) +++ src/generic/treectlg.cpp (working copy) @@ -3619,7 +3619,7 @@ return wxListBox::GetClassDefaultAttributes(variant); #else wxVisualAttributes attr; - attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT); attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); return attr; Index: src/generic/listctrl.cpp =================================================================== --- src/generic/listctrl.cpp (revision 56419) +++ src/generic/listctrl.cpp (working copy) @@ -5765,7 +5765,7 @@ #else wxUnusedVar(variant); wxVisualAttributes attr; - attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT); attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); return attr; Index: src/gtk1/settings.cpp =================================================================== --- src/gtk1/settings.cpp (revision 56419) +++ src/gtk1/settings.cpp (working copy) @@ -250,6 +250,7 @@ case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_BTNTEXT: + case wxSYS_COLOUR_LISTBOXTEXT: if (!gs_objects.m_colBtnText.Ok()) { int red, green, blue; Index: src/msw/settings.cpp =================================================================== --- src/msw/settings.cpp (revision 56419) +++ src/msw/settings.cpp (working copy) @@ -127,9 +127,14 @@ 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; } else if ( index > wxSYS_COLOUR_BTNHIGHLIGHT )