From d20fb180b178e25a676d3556ce9723e3ac207bec Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 4 Dec 2016 11:33:48 -0800
Subject: [PATCH] Display system colors in alphabetical order

---
 samples/drawing/drawing.cpp | 78 ++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

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