corrections related to event.h modifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1271,36 +1271,26 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
|
|||||||
wevent.SetOrientation(event.GetOrientation());
|
wevent.SetOrientation(event.GetOrientation());
|
||||||
wevent.m_eventObject = this;
|
wevent.m_eventObject = this;
|
||||||
|
|
||||||
switch ( event.m_eventType )
|
if (event.m_eventType == wxEVT_SCROLL_TOP) {
|
||||||
{
|
|
||||||
case wxEVT_SCROLL_TOP:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
|
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
|
||||||
case wxEVT_SCROLL_BOTTOM:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
|
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
|
||||||
case wxEVT_SCROLL_LINEUP:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
|
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
|
||||||
case wxEVT_SCROLL_LINEDOWN:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
|
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
|
||||||
case wxEVT_SCROLL_PAGEUP:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
|
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
|
||||||
case wxEVT_SCROLL_PAGEDOWN:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
|
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
|
||||||
case wxEVT_SCROLL_THUMBTRACK:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
|
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GetEventHandler()->ProcessEvent(wevent);
|
GetEventHandler()->ProcessEvent(wevent);
|
||||||
|
@@ -1271,36 +1271,26 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
|
|||||||
wevent.SetOrientation(event.GetOrientation());
|
wevent.SetOrientation(event.GetOrientation());
|
||||||
wevent.m_eventObject = this;
|
wevent.m_eventObject = this;
|
||||||
|
|
||||||
switch ( event.m_eventType )
|
if (event.m_eventType == wxEVT_SCROLL_TOP) {
|
||||||
{
|
|
||||||
case wxEVT_SCROLL_TOP:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
|
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
|
||||||
case wxEVT_SCROLL_BOTTOM:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
|
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
|
||||||
case wxEVT_SCROLL_LINEUP:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
|
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
|
||||||
case wxEVT_SCROLL_LINEDOWN:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
|
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
|
||||||
case wxEVT_SCROLL_PAGEUP:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
|
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
|
||||||
case wxEVT_SCROLL_PAGEDOWN:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
|
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
|
||||||
break;
|
} else
|
||||||
|
if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
|
||||||
case wxEVT_SCROLL_THUMBTRACK:
|
|
||||||
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
|
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GetEventHandler()->ProcessEvent(wevent);
|
GetEventHandler()->ProcessEvent(wevent);
|
||||||
|
Reference in New Issue
Block a user