Minor improvements to wxEVT_COMMAND_DIRCTRL_CHANGED generation.
Set the event object for this event. Also don't skip the original tree event if the wxEVT_COMMAND_DIRCTRL_CHANGED event was handled and disallowed. Closes #14792. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -705,11 +705,18 @@ void wxGenericDirCtrl::OnTreeSelChange(wxTreeEvent &event)
|
||||
{
|
||||
wxTreeEvent changedEvent(wxEVT_COMMAND_DIRCTRL_CHANGED, GetId());
|
||||
|
||||
changedEvent.SetEventObject(this);
|
||||
changedEvent.SetItem(event.GetItem());
|
||||
changedEvent.SetClientObject(m_treeCtrl->GetItemData(event.GetItem()));
|
||||
|
||||
GetEventHandler()->SafelyProcessEvent(changedEvent);
|
||||
event.Skip();
|
||||
if (GetEventHandler()->SafelyProcessEvent(changedEvent) && !changedEvent.IsAllowed())
|
||||
{
|
||||
event.Veto();
|
||||
}
|
||||
else
|
||||
{
|
||||
event.Skip();
|
||||
}
|
||||
}
|
||||
|
||||
void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
|
||||
|
Reference in New Issue
Block a user