button text uses fg color, not text color
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:
@@ -89,7 +89,6 @@ enum wxGtkColourType
|
||||
{
|
||||
wxGTK_FG,
|
||||
wxGTK_BG,
|
||||
wxGTK_TEXT,
|
||||
wxGTK_BASE
|
||||
};
|
||||
|
||||
@@ -150,10 +149,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;
|
||||
@@ -325,7 +320,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;
|
||||
|
Reference in New Issue
Block a user