X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98fbab9e7bf70ee8af44a78ea2a1d2cbb406880a..a4ea083bbdf710d3234dcbd2eafb5d0e078f8348:/src/common/ownerdrwcmn.cpp

diff --git a/src/common/ownerdrwcmn.cpp b/src/common/ownerdrwcmn.cpp
index 28ebb7b1e5..967a5a285b 100644
--- a/src/common/ownerdrwcmn.cpp
+++ b/src/common/ownerdrwcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Marcin Malich
 // Modified by:
 // Created:     2009-09-22
-// RCS-ID:      $Id$
 // Copyright:   (c) 2009 Marcin Malich <me@malcom.pl>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -86,9 +85,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);
     }
 }