corrected event type for standalone scrollbars (patch 1240385)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,7 +36,7 @@ wxOS2
|
|||||||
wxUniv:
|
wxUniv:
|
||||||
|
|
||||||
- Window creation now honours wxVSCROLL.
|
- Window creation now honours wxVSCROLL.
|
||||||
|
- Standalone scrollbars generate events of correct type (Jochen Roemmler)
|
||||||
|
|
||||||
2.6.1
|
2.6.1
|
||||||
-----
|
-----
|
||||||
|
@@ -554,12 +554,18 @@ bool wxScrollBar::PerformAction(const wxControlAction& action,
|
|||||||
// NB: we assume that scrollbar events are sequentially numbered
|
// NB: we assume that scrollbar events are sequentially numbered
|
||||||
// but this should be ok as other code relies on this as well
|
// but this should be ok as other code relies on this as well
|
||||||
scrollType += wxEVT_SCROLL_TOP - wxEVT_SCROLLWIN_TOP;
|
scrollType += wxEVT_SCROLL_TOP - wxEVT_SCROLLWIN_TOP;
|
||||||
|
wxScrollEvent event(scrollType, this->GetId(), m_thumbPos,
|
||||||
|
IsVertical() ? wxVERTICAL : wxHORIZONTAL);
|
||||||
|
event.SetEventObject(this);
|
||||||
|
GetParent()->GetEventHandler()->ProcessEvent(event);
|
||||||
|
}
|
||||||
|
else // part of the window
|
||||||
|
{
|
||||||
|
wxScrollWinEvent event(scrollType, m_thumbPos,
|
||||||
|
IsVertical() ? wxVERTICAL : wxHORIZONTAL);
|
||||||
|
event.SetEventObject(this);
|
||||||
|
GetParent()->GetEventHandler()->ProcessEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxScrollWinEvent event(scrollType, m_thumbPos,
|
|
||||||
IsVertical() ? wxVERTICAL : wxHORIZONTAL);
|
|
||||||
event.SetEventObject(this);
|
|
||||||
GetParent()->GetEventHandler()->ProcessEvent(event);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Reference in New Issue
Block a user