X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98fbab9e7bf70ee8af44a78ea2a1d2cbb406880a..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/common/ownerdrwcmn.cpp diff --git a/src/common/ownerdrwcmn.cpp b/src/common/ownerdrwcmn.cpp index 28ebb7b1e5..29e646a163 100644 --- a/src/common/ownerdrwcmn.cpp +++ b/src/common/ownerdrwcmn.cpp @@ -86,9 +86,18 @@ void wxOwnerDrawnBase::GetColourToUse(wxODStatus stat, wxColour& colText, wxColo else { // fall back to default colors if none explicitly specified - colText = m_colText.Ok() ? m_colText - : wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); - colBack = m_colBack.Ok() ? m_colBack + + if ( stat & wxODDisabled ) + { + colText = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); + } + else + { + colText = m_colText.IsOk() ? m_colText + : wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); + } + + colBack = m_colBack.IsOk() ? m_colBack : wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); } }