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 cfd73c9bf95ce8139e8e7fba52a3ea260c13bf4a..c7f240d747fa00129aa9b5bc10fbdffded4b8436 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -90,7 +90,6 @@ enum wxGtkColourType
 {
     wxGTK_FG,
     wxGTK_BG,
 {
     wxGTK_FG,
     wxGTK_BG,

-    wxGTK_TEXT,

     wxGTK_BASE
 };
 
     wxGTK_BASE
 };
 


@@ -151,10 +150,6 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor,
                 gdkColor = def->bg[state];
                 break;
 
                 gdkColor = def->bg[state];
                 break;
 

-            case wxGTK_TEXT:
-                gdkColor = def->text[state];
-                break;
-

             case wxGTK_BASE:
                 gdkColor = def->base[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.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;
                 gs_objects.m_colHighlightText = wxColour(gdkColor);
             }
             color = gs_objects.m_colHighlightText;