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

Avoid showing the colour selection dialog twice in wxPropertyGrid.

Browse Source 
Selecting "Custom" in a colour property cell resulted in the colour selection
dialog being shown twice if it was cancelled the first time.

Fix this by using wxPG_PROPERTY_SPECIFIC to indicate that the value is just
being queried and the user shouldn't be asked to enter it, as it is already in
the other places.

Closes #15543.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-22 14:36:00 +00:00
parent f7f941a6c1
commit 494c9c9b0b
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/propgrid/advprops.cpp
View File

@@ -1262,14 +1262,20 @@ bool wxSystemColourProperty::QueryColourFromUser( wxVariant& variant ) const
}
bool wxSystemColourProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
bool wxSystemColourProperty::IntToValue( wxVariant& variant, int number, int argFlags ) const
{
int index = number;
int type = m_choices.GetValue(index);
if ( type == wxPG_COLOUR_CUSTOM )
{
QueryColourFromUser(variant);
if ( !(argFlags & wxPG_PROPERTY_SPECIFIC) )
return QueryColourFromUser(variant);
// Call from event handler.
// User will be asked for custom color later on in OnEvent().
wxColourPropertyValue val = GetVal();
variant = DoTranslateVal(val);
}
else
{
@@ -1448,7 +1454,18 @@ bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& te
return false;
}
QueryColourFromUser(value);
if ( (argFlags & wxPG_PROPERTY_SPECIFIC) )
{
// Query for value from the event handler.
// User will be asked for custom color later on in OnEvent().
ResetNextIndex();
return false;
}
if ( !QueryColourFromUser(value) )
{
ResetNextIndex();
return false;
}
}
else
{

2
src/propgrid/editors.cpp
View File

@@ -1277,7 +1277,7 @@ bool wxPGComboBoxEditor::GetValueFromControl( wxVariant& variant, wxPGProperty*
return true;
}
bool res = property->StringToValue(variant, textVal, wxPG_EDITABLE_VALUE);
bool res = property->StringToValue(variant, textVal, wxPG_EDITABLE_VALUE|wxPG_PROPERTY_SPECIFIC);
// Changing unspecified always causes event (returning
// true here should be enough to trigger it).