Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted the last change (colour values changes), it cerated too many problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-19 21:36:28 +00:00
parent d33f1a1a9a
commit 5e2ab1ea5d
2 changed files with 60 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -9,9 +9,7 @@ INCOMPATIBLE CHANGES SINCE 2.4.x
now called much earlier/later than before; please move any exiting code
from there to wxApp::OnInit()/OnExit()
- wxFileType::GetIcon() returns wxIconLocation, not wxIcon
- the values of many colours have been updated to match their official
definitions which unfortunately means that "orange" colour in wxWindows
2.5 is not the same colour as in 2.4 series.
DEPRECATED METHODS SINCE 2.4.x
==============================

120
src/common/gdicmn.cpp
View File

@@ -208,8 +208,6 @@ wxColourDatabase::~wxColourDatabase ()
// Colour database stuff
void wxColourDatabase::Initialize ()
{
// these colour definitions are taken from X consortium definitions with a
// few more colours added
static const struct wxColourDesc
{
const wxChar *name;
@@ -217,78 +215,78 @@ void wxColourDatabase::Initialize ()
}
wxColourTable[] =
{
{wxT("AQUAMARINE"),127, 255, 212},
{wxT("AQUAMARINE"),112, 219, 147},
{wxT("BLACK"),0, 0, 0},
{wxT("BLUE"), 0, 0, 255},
{wxT("BLUE VIOLET"), 138, 43, 226},
{wxT("BLUE VIOLET"), 159, 95, 159},
{wxT("BROWN"), 165, 42, 42},
{wxT("CADET BLUE"), 95, 158, 160},
{wxT("CORAL"), 255, 127, 80},
{wxT("CORNFLOWER BLUE"), 100, 149, 237},
{wxT("CADET BLUE"), 95, 159, 159},
{wxT("CORAL"), 255, 127, 0},
{wxT("CORNFLOWER BLUE"), 66, 66, 111},
{wxT("CYAN"), 0, 255, 255},
{wxT("DARK GREY"), 169, 169, 169},
{wxT("DARK GREEN"), 0, 100, 0},
{wxT("DARK OLIVE GREEN"), 85, 107, 47},
{wxT("DARK GREY"), 47, 47, 47}, // ?
{wxT("DARK GREEN"), 47, 79, 47},
{wxT("DARK OLIVE GREEN"), 79, 79, 47},
{wxT("DARK ORCHID"), 153, 50, 204},
{wxT("DARK SLATE BLUE"), 72, 61, 139},
{wxT("DARK SLATE BLUE"), 107, 35, 142},
{wxT("DARK SLATE GREY"), 47, 79, 79},
{wxT("DARK TURQUOISE"), 0, 206, 209},
{wxT("DIM GREY"), 105, 105, 105},
{wxT("FIREBRICK"), 178, 34, 34},
{wxT("FOREST GREEN"), 34, 139, 34},
{wxT("GOLD"), 255, 215, 0},
{wxT("GOLDENROD"), 218, 165, 32},
{wxT("GREY"), 190, 190, 190},
{wxT("DARK TURQUOISE"), 112, 147, 219},
{wxT("DIM GREY"), 84, 84, 84},
{wxT("FIREBRICK"), 142, 35, 35},
{wxT("FOREST GREEN"), 35, 142, 35},
{wxT("GOLD"), 204, 127, 50},
{wxT("GOLDENROD"), 219, 219, 112},
{wxT("GREY"), 128, 128, 128},
{wxT("GREEN"), 0, 255, 0},
{wxT("GREEN YELLOW"), 173, 255, 47},
{wxT("INDIAN RED"), 205, 92, 92},
{wxT("KHAKI"), 240, 230, 140},
{wxT("LIGHT BLUE"), 173, 216, 230},
{wxT("LIGHT GREY"), 211, 211, 211},
{wxT("LIGHT STEEL BLUE"), 176, 196, 222},
{wxT("LIME GREEN"), 50, 205, 50},
{wxT("LIGHT MAGENTA"), 255, 0, 255}, // not X colour
{wxT("GREEN YELLOW"), 147, 219, 112},
{wxT("INDIAN RED"), 79, 47, 47},
{wxT("KHAKI"), 159, 159, 95},
{wxT("LIGHT BLUE"), 191, 216, 216},
{wxT("LIGHT GREY"), 192, 192, 192},
{wxT("LIGHT STEEL BLUE"), 143, 143, 188},
{wxT("LIME GREEN"), 50, 204, 50},
{wxT("LIGHT MAGENTA"), 255, 0, 255},
{wxT("MAGENTA"), 255, 0, 255},
{wxT("MAROON"), 176, 48, 96},
{wxT("MEDIUM AQUAMARINE"), 102, 205, 170},
{wxT("MEDIUM BLUE"), 0, 0, 205},
{wxT("MEDIUM FOREST GREEN"), 107, 142, 35}, // not X colour
{wxT("MEDIUM GOLD"), 204, 127, 50}, // not X, "GOLD" in 2.4
{wxT("MEDIUM GOLDENROD"), 234, 234, 173}, // not X colour
{wxT("MEDIUM GREY"), 100, 100, 100}, // not X colour
{wxT("MEDIUM ORANGE"), 204, 50, 50}, // not X, "ORANGE" in 2.4
{wxT("MEDIUM ORCHID"), 186, 85, 211},
{wxT("MEDIUM SEA GREEN"), 60, 179, 113},
{wxT("MEDIUM SLATE BLUE"), 123, 104, 238},
{wxT("MEDIUM SPRING GREEN"), 0, 250, 154},
{wxT("MEDIUM TURQUOISE"), 72, 209, 204},
{wxT("MEDIUM VIOLET RED"), 199, 21, 133},
{wxT("MIDNIGHT BLUE"), 25, 25, 112},
{wxT("NAVY"), 0, 0, 128},
{wxT("ORANGE"), 255, 165, 0},
{wxT("ORANGE RED"), 255, 69, 0},
{wxT("ORCHID"), 218, 112, 214},
{wxT("PALE GREEN"), 152, 251, 152},
{wxT("PINK"), 255, 192, 203},
{wxT("PLUM"), 221, 160, 221},
{wxT("PURPLE"), 160, 32, 240},
{wxT("MAROON"), 142, 35, 107},
{wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
{wxT("MEDIUM GREY"), 100, 100, 100},
{wxT("MEDIUM BLUE"), 50, 50, 204},
{wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
{wxT("MEDIUM GOLDENROD"), 234, 234, 173},
{wxT("MEDIUM ORCHID"), 147, 112, 219},
{wxT("MEDIUM SEA GREEN"), 66, 111, 66},
{wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
{wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
{wxT("MEDIUM TURQUOISE"), 112, 219, 219},
{wxT("MEDIUM VIOLET RED"), 219, 112, 147},
{wxT("MIDNIGHT BLUE"), 47, 47, 79},
{wxT("NAVY"), 35, 35, 142},
{wxT("ORANGE"), 204, 50, 50},
{wxT("ORANGE RED"), 255, 0, 127},
{wxT("ORCHID"), 219, 112, 219},
{wxT("PALE GREEN"), 143, 188, 143},
{wxT("PINK"), 188, 143, 234},
{wxT("PLUM"), 234, 173, 234},
{wxT("PURPLE"), 176, 0, 255},
{wxT("RED"), 255, 0, 0},
{wxT("SALMON"), 250, 128, 114},
{wxT("SEA GREEN"), 46, 139, 87},
{wxT("SIENNA"), 160, 82, 45},
{wxT("SKY BLUE"), 135, 206, 235},
{wxT("SLATE BLUE"), 106, 90, 205},
{wxT("SALMON"), 111, 66, 66},
{wxT("SEA GREEN"), 35, 142, 107},
{wxT("SIENNA"), 142, 107, 35},
{wxT("SKY BLUE"), 50, 153, 204},
{wxT("SLATE BLUE"), 0, 127, 255},
{wxT("SPRING GREEN"), 0, 255, 127},
{wxT("STEEL BLUE"), 70, 130, 180},
{wxT("TAN"), 210, 180, 140},
{wxT("STEEL BLUE"), 35, 107, 142},
{wxT("TAN"), 219, 147, 112},
{wxT("THISTLE"), 216, 191, 216},
{wxT("TURQUOISE"), 64, 224, 208},
{wxT("VIOLET"), 238, 130, 238},
{wxT("VIOLET RED"), 208, 32, 144},
{wxT("WHEAT"), 245, 222, 179},
{wxT("TURQUOISE"), 173, 234, 234},
{wxT("VIOLET"), 79, 47, 79},
{wxT("VIOLET RED"), 204, 50, 153},
{wxT("WHEAT"), 216, 216, 191},
{wxT("WHITE"), 255, 255, 255},
{wxT("YELLOW"), 255, 255, 0},
{wxT("YELLOW GREEN"), 154, 205, 50},
{wxT("YELLOW GREEN"), 153, 204, 50},
{wxT("YELLOW GREEN"), 153, 204, 50}
};
size_t n;