| @@ -74,6 +74,7 @@ const Colour Colours::floralwhite (0xfffffaf0); | |||||
| const Colour Colours::forestgreen (0xff228b22); | const Colour Colours::forestgreen (0xff228b22); | ||||
| const Colour Colours::fuchsia (0xffff00ff); | const Colour Colours::fuchsia (0xffff00ff); | ||||
| const Colour Colours::gainsboro (0xffdcdcdc); | const Colour Colours::gainsboro (0xffdcdcdc); | ||||
| const Colour Colours::ghostwhite (0xfff8f8ff); | |||||
| const Colour Colours::gold (0xffffd700); | const Colour Colours::gold (0xffffd700); | ||||
| const Colour Colours::goldenrod (0xffdaa520); | const Colour Colours::goldenrod (0xffdaa520); | ||||
| const Colour Colours::grey (0xff808080); | const Colour Colours::grey (0xff808080); | ||||
| @@ -87,6 +88,7 @@ const Colour Colours::ivory (0xfffffff0); | |||||
| const Colour Colours::khaki (0xfff0e68c); | const Colour Colours::khaki (0xfff0e68c); | ||||
| const Colour Colours::lavender (0xffe6e6fa); | const Colour Colours::lavender (0xffe6e6fa); | ||||
| const Colour Colours::lavenderblush (0xfffff0f5); | const Colour Colours::lavenderblush (0xfffff0f5); | ||||
| const Colour Colours::lawngreen (0xff7cfc00); | |||||
| const Colour Colours::lemonchiffon (0xfffffacd); | const Colour Colours::lemonchiffon (0xfffffacd); | ||||
| const Colour Colours::lightblue (0xffadd8e6); | const Colour Colours::lightblue (0xffadd8e6); | ||||
| const Colour Colours::lightcoral (0xfff08080); | const Colour Colours::lightcoral (0xfff08080); | ||||
| @@ -118,6 +120,7 @@ const Colour Colours::mediumvioletred (0xffc71585); | |||||
| const Colour Colours::midnightblue (0xff191970); | const Colour Colours::midnightblue (0xff191970); | ||||
| const Colour Colours::mintcream (0xfff5fffa); | const Colour Colours::mintcream (0xfff5fffa); | ||||
| const Colour Colours::mistyrose (0xffffe4e1); | const Colour Colours::mistyrose (0xffffe4e1); | ||||
| const Colour Colours::moccasin (0xffffe4b5); | |||||
| const Colour Colours::navajowhite (0xffffdead); | const Colour Colours::navajowhite (0xffffdead); | ||||
| const Colour Colours::navy (0xff000080); | const Colour Colours::navy (0xff000080); | ||||
| const Colour Colours::oldlace (0xfffdf5e6); | const Colour Colours::oldlace (0xfffdf5e6); | ||||
| @@ -137,6 +140,7 @@ const Colour Colours::pink (0xffffc0cb); | |||||
| const Colour Colours::plum (0xffdda0dd); | const Colour Colours::plum (0xffdda0dd); | ||||
| const Colour Colours::powderblue (0xffb0e0e6); | const Colour Colours::powderblue (0xffb0e0e6); | ||||
| const Colour Colours::purple (0xff800080); | const Colour Colours::purple (0xff800080); | ||||
| const Colour Colours::rebeccapurple (0xff663399); | |||||
| const Colour Colours::red (0xffff0000); | const Colour Colours::red (0xffff0000); | ||||
| const Colour Colours::rosybrown (0xffbc8f8f); | const Colour Colours::rosybrown (0xffbc8f8f); | ||||
| const Colour Colours::royalblue (0xff4169e1); | const Colour Colours::royalblue (0xff4169e1); | ||||
| @@ -225,6 +229,7 @@ Colour Colours::findColourForName (const String& colourName, | |||||
| 0xd086fd06, 0xff228b22, /* forestgreen */ | 0xd086fd06, 0xff228b22, /* forestgreen */ | ||||
| 0xe106b6d7, 0xffff00ff, /* fuchsia */ | 0xe106b6d7, 0xffff00ff, /* fuchsia */ | ||||
| 0x7880d61e, 0xffdcdcdc, /* gainsboro */ | 0x7880d61e, 0xffdcdcdc, /* gainsboro */ | ||||
| 0x2018a2fa, 0xfff8f8ff, /* ghostwhite */ | |||||
| 0x00308060, 0xffffd700, /* gold */ | 0x00308060, 0xffffd700, /* gold */ | ||||
| 0xb3b3bc1e, 0xffdaa520, /* goldenrod */ | 0xb3b3bc1e, 0xffdaa520, /* goldenrod */ | ||||
| 0xbab8a537, 0xffadff2f, /* greenyellow */ | 0xbab8a537, 0xffadff2f, /* greenyellow */ | ||||
| @@ -236,6 +241,7 @@ Colour Colours::findColourForName (const String& colourName, | |||||
| 0x06149302, 0xfff0e68c, /* khaki */ | 0x06149302, 0xfff0e68c, /* khaki */ | ||||
| 0xad5a05c7, 0xffe6e6fa, /* lavender */ | 0xad5a05c7, 0xffe6e6fa, /* lavender */ | ||||
| 0x7c4d5b99, 0xfffff0f5, /* lavenderblush */ | 0x7c4d5b99, 0xfffff0f5, /* lavenderblush */ | ||||
| 0x41cc4377, 0xff7cfc00, /* lawngreen */ | |||||
| 0x195756f0, 0xfffffacd, /* lemonchiffon */ | 0x195756f0, 0xfffffacd, /* lemonchiffon */ | ||||
| 0x28e4ea70, 0xffadd8e6, /* lightblue */ | 0x28e4ea70, 0xffadd8e6, /* lightblue */ | ||||
| 0xf3c7ccdb, 0xfff08080, /* lightcoral */ | 0xf3c7ccdb, 0xfff08080, /* lightcoral */ | ||||
| @@ -267,6 +273,7 @@ Colour Colours::findColourForName (const String& colourName, | |||||
| 0x168eb32a, 0xff191970, /* midnightblue */ | 0x168eb32a, 0xff191970, /* midnightblue */ | ||||
| 0x4306b960, 0xfff5fffa, /* mintcream */ | 0x4306b960, 0xfff5fffa, /* mintcream */ | ||||
| 0x4cbc0e6b, 0xffffe4e1, /* mistyrose */ | 0x4cbc0e6b, 0xffffe4e1, /* mistyrose */ | ||||
| 0xd9447d59, 0xffffe4b5, /* moccasin */ | |||||
| 0xe97218a6, 0xffffdead, /* navajowhite */ | 0xe97218a6, 0xffffdead, /* navajowhite */ | ||||
| 0x00337bb6, 0xff000080, /* navy */ | 0x00337bb6, 0xff000080, /* navy */ | ||||
| 0xadd2d33e, 0xfffdf5e6, /* oldlace */ | 0xadd2d33e, 0xfffdf5e6, /* oldlace */ | ||||
| @@ -286,6 +293,7 @@ Colour Colours::findColourForName (const String& colourName, | |||||
| 0x00348d94, 0xffdda0dd, /* plum */ | 0x00348d94, 0xffdda0dd, /* plum */ | ||||
| 0xd036be93, 0xffb0e0e6, /* powderblue */ | 0xd036be93, 0xffb0e0e6, /* powderblue */ | ||||
| 0xc5c507bc, 0xff800080, /* purple */ | 0xc5c507bc, 0xff800080, /* purple */ | ||||
| 0xf381f607, 0xff663399, /* rebeccapurple */ | |||||
| 0xa89d65b3, 0xffbc8f8f, /* rosybrown */ | 0xa89d65b3, 0xffbc8f8f, /* rosybrown */ | ||||
| 0xbd9413e1, 0xff4169e1, /* royalblue */ | 0xbd9413e1, 0xff4169e1, /* royalblue */ | ||||
| 0xf456044f, 0xff8b4513, /* saddlebrown */ | 0xf456044f, 0xff8b4513, /* saddlebrown */ | ||||
| @@ -52,39 +52,40 @@ public: | |||||
| yellow, /**< ARGB = 0xffffff00 */ | yellow, /**< ARGB = 0xffffff00 */ | ||||
| //============================================================================== | //============================================================================== | ||||
| aliceblue, antiquewhite, aqua, aquamarine, | |||||
| azure, beige, bisque, blanchedalmond, | |||||
| blueviolet, brown, burlywood, cadetblue, | |||||
| chartreuse, chocolate, coral, cornflowerblue, | |||||
| cornsilk, crimson, cyan, darkblue, | |||||
| darkcyan, darkgoldenrod, darkgrey, darkgreen, | |||||
| darkkhaki, darkmagenta, darkolivegreen, darkorange, | |||||
| darkorchid, darkred, darksalmon, darkseagreen, | |||||
| darkslateblue, darkslategrey, darkturquoise, darkviolet, | |||||
| deeppink, deepskyblue, dimgrey, dodgerblue, | |||||
| firebrick, floralwhite, forestgreen, fuchsia, | |||||
| gainsboro, gold, goldenrod, greenyellow, | |||||
| honeydew, hotpink, indianred, indigo, | |||||
| ivory, khaki, lavender, lavenderblush, | |||||
| lemonchiffon, lightblue, lightcoral, lightcyan, | |||||
| lightgoldenrodyellow, lightgreen, lightgrey, lightpink, | |||||
| lightsalmon, lightseagreen, lightskyblue, lightslategrey, | |||||
| lightsteelblue, lightyellow, lime, limegreen, | |||||
| linen, magenta, maroon, mediumaquamarine, | |||||
| mediumblue, mediumorchid, mediumpurple, mediumseagreen, | |||||
| mediumslateblue, mediumspringgreen, mediumturquoise, mediumvioletred, | |||||
| midnightblue, mintcream, mistyrose, navajowhite, | |||||
| navy, oldlace, olive, olivedrab, | |||||
| orange, orangered, orchid, palegoldenrod, | |||||
| palegreen, paleturquoise, palevioletred, papayawhip, | |||||
| peachpuff, peru, pink, plum, | |||||
| powderblue, purple, rosybrown, royalblue, | |||||
| saddlebrown, salmon, sandybrown, seagreen, | |||||
| seashell, sienna, silver, skyblue, | |||||
| slateblue, slategrey, snow, springgreen, | |||||
| steelblue, tan, teal, thistle, | |||||
| tomato, turquoise, violet, wheat, | |||||
| whitesmoke, yellowgreen; | |||||
| aliceblue, antiquewhite, aqua, aquamarine, | |||||
| azure, beige, bisque, blanchedalmond, | |||||
| blueviolet, brown, burlywood, cadetblue, | |||||
| chartreuse, chocolate, coral, cornflowerblue, | |||||
| cornsilk, crimson, cyan, darkblue, | |||||
| darkcyan, darkgoldenrod, darkgrey, darkgreen, | |||||
| darkkhaki, darkmagenta, darkolivegreen, darkorange, | |||||
| darkorchid, darkred, darksalmon, darkseagreen, | |||||
| darkslateblue, darkslategrey, darkturquoise, darkviolet, | |||||
| deeppink, deepskyblue, dimgrey, dodgerblue, | |||||
| firebrick, floralwhite, forestgreen, fuchsia, | |||||
| gainsboro, ghostwhite, gold, goldenrod, | |||||
| greenyellow, honeydew, hotpink, indianred, | |||||
| indigo, ivory, khaki, lavender, | |||||
| lavenderblush, lawngreen, lemonchiffon, lightblue, | |||||
| lightcoral, lightcyan, lightgoldenrodyellow, lightgreen, | |||||
| lightgrey, lightpink, lightsalmon, lightseagreen, | |||||
| lightskyblue, lightslategrey, lightsteelblue, lightyellow, | |||||
| lime, limegreen, linen, magenta, | |||||
| maroon, mediumaquamarine, mediumblue, mediumorchid, | |||||
| mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen, | |||||
| mediumturquoise, mediumvioletred, midnightblue, mintcream, | |||||
| mistyrose, moccasin, navajowhite, navy, | |||||
| oldlace, olive, olivedrab, orange, | |||||
| orangered, orchid, palegoldenrod, palegreen, | |||||
| paleturquoise, palevioletred, papayawhip, peachpuff, | |||||
| peru, pink, plum, powderblue, | |||||
| purple, rebeccapurple, rosybrown, royalblue, | |||||
| saddlebrown, salmon, sandybrown, seagreen, | |||||
| seashell, sienna, silver, skyblue, | |||||
| slateblue, slategrey, snow, springgreen, | |||||
| steelblue, tan, teal, thistle, | |||||
| tomato, turquoise, violet, wheat, | |||||
| whitesmoke, yellowgreen; | |||||
| /** Attempts to look up a string in the list of known colour names, and return | /** Attempts to look up a string in the list of known colour names, and return | ||||
| the appropriate colour. | the appropriate colour. | ||||