From: Paul Cornett Date: Wed, 21 May 2008 16:18:49 +0000 (+0000) Subject: button text uses fg color, not text color X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/241c8d223ee3c2c2ffbc3a8ae5f6309167fbe1de?hp=129848c2583e2e6072cd50be63c0ece06f14f908 button text uses fg color, not text color git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index cfd73c9bf9..c7f240d747 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -90,7 +90,6 @@ enum wxGtkColourType { wxGTK_FG, wxGTK_BG, - wxGTK_TEXT, wxGTK_BASE }; @@ -151,10 +150,6 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor, gdkColor = def->bg[state]; break; - case wxGTK_TEXT: - gdkColor = def->text[state]; - break; - case wxGTK_BASE: gdkColor = def->base[state]; break; @@ -326,7 +321,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) gdkColor.green = gdkColor.blue = 0; GetColourFromGTKWidget( - gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_TEXT); + gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_FG); gs_objects.m_colHighlightText = wxColour(gdkColor); } color = gs_objects.m_colHighlightText;