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

Fix initialization of custom colours for colour dialog in wxSystemColourProperty::QueryColourFromUser.

Browse Source 
Use number of custom colours taken from wxColourData instead of using explicit numeric value.
This commit is contained in:
Artur Wieczorek
2015-11-18 20:16:06 +01:00
parent 17d5429276
commit 363492e50b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/propgrid/advprops.cpp
View File

@@ -1239,10 +1239,10 @@ bool wxSystemColourProperty::QueryColourFromUser( wxVariant& variant ) const
data.SetChooseFull(true); data.SetChooseFull(true);
data.SetChooseAlpha(GetAttributeAsLong(wxPG_COLOUR_HAS_ALPHA, 0) != 0); data.SetChooseAlpha(GetAttributeAsLong(wxPG_COLOUR_HAS_ALPHA, 0) != 0);
data.SetColour(val.m_colour); data.SetColour(val.m_colour);
for ( int i = 0; i < 16; i++ ) for ( int i = 0; i < wxColourData::NUM_CUSTOM; i++ )
{ {
wxColour colour(i*16, i*16, i*16); unsigned char n = i*(256/wxColourData::NUM_CUSTOM);
data.SetCustomColour(i, colour); data.SetCustomColour(i, wxColour(n, n, n));
} }
wxColourDialog dialog(propgrid, &data); wxColourDialog dialog(propgrid, &data);