From 8c7ada391aec596281645f9a5ac7d393ad150e4d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 12 Feb 2016 03:17:46 +0100 Subject: [PATCH] Reformat the system colour names in the drawing sample No real changes, just prettify the code a little. --- samples/drawing/drawing.cpp | 46 +++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index e16ad1ff83..e9752cd3ba 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -1559,18 +1559,40 @@ void MyCanvas::DrawSystemColours(wxDC& dc) dc.SetPen(*wxTRANSPARENT_PEN); - static const char* sysColNames[] = { - "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", + static const char* sysColNames[] = + { + "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" };