Implementations of wxPGProperty::ChildChanged() must now return changed value of the whole property instead of writing it back to 'thisValue' argument. This change was done primarily for better compatibility with wxPython bindings, but should also be slightly more cleaner behavior API-wise. Breaks backwards compatibility, but not silently.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1487,15 +1487,18 @@ void wxFlagsProperty::RefreshChildren()
|
||||
m_oldValue = flags;
|
||||
}
|
||||
|
||||
void wxFlagsProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
|
||||
wxVariant wxFlagsProperty::ChildChanged( wxVariant& thisValue,
|
||||
int childIndex,
|
||||
wxVariant& childValue ) const
|
||||
{
|
||||
long oldValue = thisValue.GetLong();
|
||||
long val = childValue.GetLong();
|
||||
unsigned long vi = m_choices.GetValue(childIndex);
|
||||
|
||||
if ( val )
|
||||
thisValue = (long)(oldValue | vi);
|
||||
else
|
||||
thisValue = (long)(oldValue & ~(vi));
|
||||
return (long) (oldValue | vi);
|
||||
|
||||
return (long) (oldValue & ~(vi));
|
||||
}
|
||||
|
||||
bool wxFlagsProperty::DoSetAttribute( const wxString& name, wxVariant& value )
|
||||
|
Reference in New Issue
Block a user