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

Fixed wxSystemColourProperty::ValueToString(). It now once again properly formats custom colour selection as (R, G, B) when displayed.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-19 11:16:29 +00:00
parent deb0c40261
commit c904964610
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/propgrid/advprops.cpp
View File

@@ -1001,11 +1001,29 @@ wxString wxSystemColourProperty::ColourToString( const wxColour& col, int index
}
wxString wxSystemColourProperty::ValueToString( wxVariant& value,
int WXUNUSED(argFlags) ) const
int argFlags ) const
{
wxColourPropertyValue val = GetVal(&value);
return ColourToString(val.m_colour, m_choices.Index(val.m_type));
int index;
if ( argFlags & wxPG_VALUE_IS_CURRENT )
{
// GetIndex() only works reliably if wxPG_VALUE_IS_CURRENT flag is set,
// but we should use it whenever possible.
index = GetIndex();
// If custom colour was selected, use invalid index, so that
// ColourToString() will return properly formatted colour text.
if ( index == GetCustomColourIndex() )
index = wxNOT_FOUND;
}
else
{
index = m_choices.Index(val.m_type);
}
return ColourToString(val.m_colour, index);
}