Fixes for WXWIN_COMPATIBILITY, and BC++ fix for event.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -181,7 +181,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
|
||||
int nScrollInc = 0;
|
||||
switch (event.GetEventType())
|
||||
{
|
||||
case wxEVENT_TYPE_SCROLL_TOP:
|
||||
case wxEVT_SCROLL_TOP:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
nScrollInc = - m_xScrollPosition;
|
||||
@@ -189,7 +189,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
|
||||
nScrollInc = - m_yScrollPosition;
|
||||
break;
|
||||
}
|
||||
case wxEVENT_TYPE_SCROLL_BOTTOM:
|
||||
case wxEVT_SCROLL_BOTTOM:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
nScrollInc = m_xScrollLines - m_xScrollPosition;
|
||||
@@ -197,17 +197,17 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
|
||||
nScrollInc = m_yScrollLines - m_yScrollPosition;
|
||||
break;
|
||||
}
|
||||
case wxEVENT_TYPE_SCROLL_LINEUP:
|
||||
case wxEVT_SCROLL_LINEUP:
|
||||
{
|
||||
nScrollInc = -1;
|
||||
break;
|
||||
}
|
||||
case wxEVENT_TYPE_SCROLL_LINEDOWN:
|
||||
case wxEVT_SCROLL_LINEDOWN:
|
||||
{
|
||||
nScrollInc = 1;
|
||||
break;
|
||||
}
|
||||
case wxEVENT_TYPE_SCROLL_PAGEUP:
|
||||
case wxEVT_SCROLL_PAGEUP:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
|
||||
@@ -215,7 +215,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
|
||||
nScrollInc = -GetScrollPageSize(wxVERTICAL);
|
||||
break;
|
||||
}
|
||||
case wxEVENT_TYPE_SCROLL_PAGEDOWN:
|
||||
case wxEVT_SCROLL_PAGEDOWN:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
nScrollInc = GetScrollPageSize(wxHORIZONTAL);
|
||||
@@ -223,7 +223,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
|
||||
nScrollInc = GetScrollPageSize(wxVERTICAL);
|
||||
break;
|
||||
}
|
||||
case wxEVENT_TYPE_SCROLL_THUMBTRACK:
|
||||
case wxEVT_SCROLL_THUMBTRACK:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
nScrollInc = pos - m_xScrollPosition;
|
||||
|
Reference in New Issue
Block a user