Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

button text uses fg color, not text color

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-05-21 16:18:49 +00:00
parent 11a7b96b4f
commit fbeb764bf5
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/settings.cpp
View File

@@ -89,7 +89,6 @@ enum wxGtkColourType
{ {
wxGTK_FG, wxGTK_FG,
wxGTK_BG, wxGTK_BG,
wxGTK_TEXT,
wxGTK_BASE wxGTK_BASE
}; };
@@ -150,10 +149,6 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor,
gdkColor = def->bg[state]; gdkColor = def->bg[state];
break; break;
case wxGTK_TEXT:
gdkColor = def->text[state];
break;
case wxGTK_BASE: case wxGTK_BASE:
gdkColor = def->base[state]; gdkColor = def->base[state];
break; break;
@@ -325,7 +320,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
gdkColor.green = gdkColor.green =
gdkColor.blue = 0; gdkColor.blue = 0;
GetColourFromGTKWidget( GetColourFromGTKWidget(
gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_TEXT); gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_FG);
gs_objects.m_colHighlightText = wxColour(gdkColor); gs_objects.m_colHighlightText = wxColour(gdkColor);
} }
color = gs_objects.m_colHighlightText; color = gs_objects.m_colHighlightText;