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

Allow use of all wxPG colours.

Browse Source 
wxPG-specific colours are added to the colour database when wxColourProperty is created (already existing colours are not overwritten by wxPG ones).
Original list of wxPG colours was restored.

Closes #15597.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2014-07-12 10:47:15 +00:00
parent 635694c9b3
commit 498dc8161c
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/propgrid/advprops.cpp
View File

@@ -1541,28 +1541,46 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
static const char* const gs_cp_es_normcolour_labels[] = {
wxTRANSLATE("Black"),
wxTRANSLATE("Red"),
wxTRANSLATE("Maroon"),
wxTRANSLATE("Navy"),
wxTRANSLATE("Purple"),
wxTRANSLATE("Teal"),
wxTRANSLATE("Gray"),
wxTRANSLATE("Green"),
wxTRANSLATE("Olive"),
wxTRANSLATE("Brown"),
wxTRANSLATE("Blue"),
wxTRANSLATE("Cyan"),
wxTRANSLATE("Magenta"),
wxTRANSLATE("Fuchsia"),
wxTRANSLATE("Red"),
wxTRANSLATE("Orange"),
wxTRANSLATE("Silver"),
wxTRANSLATE("Lime"),
wxTRANSLATE("Aqua"),
wxTRANSLATE("Yellow"),
wxTRANSLATE("White"),
wxTRANSLATE("Grey"),
wxTRANSLATE("Custom"),
NULL
};
static const unsigned long gs_cp_es_normcolour_colours[] = {
wxPG_COLOUR(0,0,0),
wxPG_COLOUR(255,0,0),
wxPG_COLOUR(0,255,0),
wxPG_COLOUR(128,0,0),
wxPG_COLOUR(0,0,128),
wxPG_COLOUR(128,0,128),
wxPG_COLOUR(0,128,128),
wxPG_COLOUR(128,128,128),
wxPG_COLOUR(0,128,0),
wxPG_COLOUR(128,128,0),
wxPG_COLOUR(166,124,81),
wxPG_COLOUR(0,0,255),
wxPG_COLOUR(0,255,255),
wxPG_COLOUR(255,0,255),
wxPG_COLOUR(255,0,0),
wxPG_COLOUR(247,148,28),
wxPG_COLOUR(192,192,192),
wxPG_COLOUR(0,255,0),
wxPG_COLOUR(0,255,255),
wxPG_COLOUR(255,255,0),
wxPG_COLOUR(255,255,255),
wxPG_COLOUR(128,128,128),
wxPG_COLOUR(0,0,0)
};
@@ -1578,6 +1596,20 @@ wxColourProperty::wxColourProperty( const wxString& label,
NULL,
&gs_wxColourProperty_choicesCache, value )
{
// Extended colour database with custom PG colours.
const char* const* colourLabels = gs_cp_es_normcolour_labels;
for ( int i = 0; *colourLabels; colourLabels++, i++ )
{
wxColour clr = wxTheColourDatabase->Find(*colourLabels);
// Use standard wx colour value if its label was found,
// otherwise register custom PG colour.
if ( !clr.IsOk() )
{
clr.Set(gs_cp_es_normcolour_colours[i]);
wxTheColourDatabase->AddColour(*colourLabels, clr);
}
}
Init( value );
m_flags |= wxPG_PROP_TRANSLATE_CUSTOM;
@@ -1614,7 +1646,7 @@ wxString wxColourProperty::ValueToString( wxVariant& value,
wxColour wxColourProperty::GetColour( int index ) const
{
return gs_cp_es_normcolour_colours[m_choices.GetValue(index)];
return wxColour(gs_cp_es_normcolour_labels[m_choices.GetValue(index)]);
}
wxVariant wxColourProperty::DoTranslateVal( wxColourPropertyValue& v ) const