Display system colors in alphabetical order

This commit is contained in:
Paul Cornett
2016-12-04 11:33:48 -08:00
parent 4b8c83cb09
commit d20fb180b1

View File

@@ -1590,50 +1590,50 @@ void MyCanvas::DrawSystemColours(wxDC& dc)
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
static const char* sysColNames[] = static const struct {
wxSystemColour index;
const char* name;
} sysColours[] =
{ {
"wxSYS_COLOUR_SCROLLBAR", { wxSYS_COLOUR_3DDKSHADOW, "wxSYS_COLOUR_3DDKSHADOW" },
"wxSYS_COLOUR_DESKTOP", { wxSYS_COLOUR_3DLIGHT, "wxSYS_COLOUR_3DLIGHT" },
"wxSYS_COLOUR_ACTIVECAPTION", { wxSYS_COLOUR_ACTIVEBORDER, "wxSYS_COLOUR_ACTIVEBORDER" },
"wxSYS_COLOUR_INACTIVECAPTION", { wxSYS_COLOUR_ACTIVECAPTION, "wxSYS_COLOUR_ACTIVECAPTION" },
"wxSYS_COLOUR_MENU", { wxSYS_COLOUR_APPWORKSPACE, "wxSYS_COLOUR_APPWORKSPACE" },
"wxSYS_COLOUR_WINDOW", { wxSYS_COLOUR_BTNFACE, "wxSYS_COLOUR_BTNFACE" },
"wxSYS_COLOUR_WINDOWFRAME", { wxSYS_COLOUR_BTNHIGHLIGHT, "wxSYS_COLOUR_BTNHIGHLIGHT" },
"wxSYS_COLOUR_MENUTEXT", { wxSYS_COLOUR_BTNSHADOW, "wxSYS_COLOUR_BTNSHADOW" },
"wxSYS_COLOUR_WINDOWTEXT", { wxSYS_COLOUR_BTNTEXT, "wxSYS_COLOUR_BTNTEXT" },
"wxSYS_COLOUR_CAPTIONTEXT", { wxSYS_COLOUR_CAPTIONTEXT, "wxSYS_COLOUR_CAPTIONTEXT" },
"wxSYS_COLOUR_ACTIVEBORDER", { wxSYS_COLOUR_DESKTOP, "wxSYS_COLOUR_DESKTOP" },
"wxSYS_COLOUR_INACTIVEBORDER", { wxSYS_COLOUR_GRADIENTACTIVECAPTION, "wxSYS_COLOUR_GRADIENTACTIVECAPTION" },
"wxSYS_COLOUR_APPWORKSPACE", { wxSYS_COLOUR_GRADIENTINACTIVECAPTION, "wxSYS_COLOUR_GRADIENTINACTIVECAPTION" },
"wxSYS_COLOUR_HIGHLIGHT", { wxSYS_COLOUR_GRAYTEXT, "wxSYS_COLOUR_GRAYTEXT" },
"wxSYS_COLOUR_HIGHLIGHTTEXT", { wxSYS_COLOUR_HIGHLIGHTTEXT, "wxSYS_COLOUR_HIGHLIGHTTEXT" },
"wxSYS_COLOUR_BTNFACE", { wxSYS_COLOUR_HIGHLIGHT, "wxSYS_COLOUR_HIGHLIGHT" },
"wxSYS_COLOUR_BTNSHADOW", { wxSYS_COLOUR_HOTLIGHT, "wxSYS_COLOUR_HOTLIGHT" },
"wxSYS_COLOUR_GRAYTEXT", { wxSYS_COLOUR_INACTIVEBORDER, "wxSYS_COLOUR_INACTIVEBORDER" },
"wxSYS_COLOUR_BTNTEXT", { wxSYS_COLOUR_INACTIVECAPTIONTEXT, "wxSYS_COLOUR_INACTIVECAPTIONTEXT" },
"wxSYS_COLOUR_INACTIVECAPTIONTEXT", { wxSYS_COLOUR_INACTIVECAPTION, "wxSYS_COLOUR_INACTIVECAPTION" },
"wxSYS_COLOUR_BTNHIGHLIGHT", { wxSYS_COLOUR_INFOBK, "wxSYS_COLOUR_INFOBK" },
"wxSYS_COLOUR_3DDKSHADOW", { wxSYS_COLOUR_INFOTEXT, "wxSYS_COLOUR_INFOTEXT" },
"wxSYS_COLOUR_3DLIGHT", { wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT, "wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT" },
"wxSYS_COLOUR_INFOTEXT", { wxSYS_COLOUR_LISTBOXTEXT, "wxSYS_COLOUR_LISTBOXTEXT" },
"wxSYS_COLOUR_INFOBK", { wxSYS_COLOUR_LISTBOX, "wxSYS_COLOUR_LISTBOX" },
"wxSYS_COLOUR_LISTBOX", { wxSYS_COLOUR_MENUBAR, "wxSYS_COLOUR_MENUBAR" },
"wxSYS_COLOUR_HOTLIGHT", { wxSYS_COLOUR_MENUHILIGHT, "wxSYS_COLOUR_MENUHILIGHT" },
"wxSYS_COLOUR_GRADIENTACTIVECAPTION", { wxSYS_COLOUR_MENUTEXT, "wxSYS_COLOUR_MENUTEXT" },
"wxSYS_COLOUR_GRADIENTINACTIVECAPTION", { wxSYS_COLOUR_MENU, "wxSYS_COLOUR_MENU" },
"wxSYS_COLOUR_MENUHILIGHT", { wxSYS_COLOUR_SCROLLBAR, "wxSYS_COLOUR_SCROLLBAR" },
"wxSYS_COLOUR_MENUBAR", { wxSYS_COLOUR_WINDOWFRAME, "wxSYS_COLOUR_WINDOWFRAME" },
"wxSYS_COLOUR_LISTBOXTEXT", { wxSYS_COLOUR_WINDOWTEXT, "wxSYS_COLOUR_WINDOWTEXT" },
"wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT" { wxSYS_COLOUR_WINDOW, "wxSYS_COLOUR_WINDOW" }
}; };
for (int i = 0; i < wxSYS_COLOUR_MAX; i++) for (int i = 0; i < wxSYS_COLOUR_MAX; i++)
{ {
wxSystemColour sysColour = (wxSystemColour)i; wxString colourName(sysColours[i].name);
wxColour c(wxSystemSettings::GetColour(sysColours[i].index));
wxString colourName = sysColNames[sysColour];
wxColour c = wxSystemSettings::GetColour(sysColour);
{ {
wxDCFontChanger setMono(dc, mono); wxDCFontChanger setMono(dc, mono);