X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/166b4de727d502df57d9dc8764f5047911032b59..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/gtk/settings.cpp diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 2cbc4b0875..c7f240d747 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -122,11 +122,11 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor, case wxGTK_MENUITEM: widget = gtk_menu_item_new(); - + break; + case wxGTK_MENUBAR: widget = gtk_menu_bar_new(); break; - } GtkStyle *def = gtk_rc_get_style( widget ); @@ -317,11 +317,12 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_HIGHLIGHTTEXT: if (!gs_objects.m_colHighlightText.Ok()) { - wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); - if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) - gs_objects.m_colHighlightText = *wxBLACK; - else - gs_objects.m_colHighlightText = *wxWHITE; + gdkColor.red = + gdkColor.green = + gdkColor.blue = 0; + GetColourFromGTKWidget( + gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_FG); + gs_objects.m_colHighlightText = wxColour(gdkColor); } color = gs_objects.m_colHighlightText; break;