don't skip the scroll position validity check in CalcScrollInc() if m_[xy]ScrollPixelsPerLine is NULL, this resulted in problems mentioned in patch 1696082
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -612,8 +612,6 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
|
||||
}
|
||||
|
||||
if (orient == wxHORIZONTAL)
|
||||
{
|
||||
if (m_xScrollPixelsPerLine > 0)
|
||||
{
|
||||
if ( m_xScrollPosition + nScrollInc < 0 )
|
||||
{
|
||||
@@ -630,12 +628,7 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
m_targetWindow->Refresh(true, GetScrollRect());
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( m_yScrollPixelsPerLine > 0 )
|
||||
else // wxVERTICAL
|
||||
{
|
||||
if ( m_yScrollPosition + nScrollInc < 0 )
|
||||
{
|
||||
@@ -652,12 +645,6 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// VZ: why do we do this? (FIXME)
|
||||
m_targetWindow->Refresh(true, GetScrollRect());
|
||||
}
|
||||
}
|
||||
|
||||
return nScrollInc;
|
||||
}
|
||||
|
Reference in New Issue
Block a user