Fix off-by-one in vertical scrolling

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 506d56ffc20d55fa8584a30c291118e9a530e46a..f1c0e43a0a3d80affa9cc6f85a6d8b350fe0b22c 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -269,7 +269,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
         if (sbMax != nMax || sbThumb != nPage) {
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
         if (sbMax != nMax || sbThumb != nPage) {

-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
+            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1);

             modified = true;
         }
     }
             modified = true;
         }
     }


@@ -278,7 +278,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         if (sbMax != nMax || sbPage != nPage) {
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         if (sbMax != nMax || sbPage != nPage) {

-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
+            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax+1, nPage);

             modified = true;
         }
     }
             modified = true;
         }
     }

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 506d56ffc20d55fa8584a30c291118e9a530e46a..f1c0e43a0a3d80affa9cc6f85a6d8b350fe0b22c 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -269,7 +269,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
         if (sbMax != nMax || sbThumb != nPage) {
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
         if (sbMax != nMax || sbThumb != nPage) {

-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
+            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1);

             modified = true;
         }
     }
             modified = true;
         }
     }


@@ -278,7 +278,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         if (sbMax != nMax || sbPage != nPage) {
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         if (sbMax != nMax || sbPage != nPage) {

-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
+            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax+1, nPage);

             modified = true;
         }
     }
             modified = true;
         }
     }