From bf67b13520f95ee480071f54757a36f5c4de9ec6 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 12 Feb 2005 12:36:12 +0000 Subject: [PATCH] Revert patch again, as the scrollbars are now always shown. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/scrlwing.cpp | 4 ++-- src/gtk/scrolwin.cpp | 8 ++++---- src/gtk1/scrolwin.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index d97d6ab1bc..cd61575c37 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -653,7 +653,7 @@ void wxScrollHelper::AdjustScrollbars() else { int vVirt = m_targetWindow->GetVirtualSize().GetWidth(); - m_xScrollLines = (vVirt+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; + m_xScrollLines = vVirt / m_xScrollPixelsPerLine; // Calculate page size i.e. number of scroll units you get on the // current client window @@ -687,7 +687,7 @@ void wxScrollHelper::AdjustScrollbars() else // might need scrolling { int hVirt = m_targetWindow->GetVirtualSize().GetHeight(); - m_yScrollLines = (hVirt+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; + m_yScrollLines = hVirt / m_yScrollPixelsPerLine; // Calculate page size i.e. number of scroll units you get on the // current client window diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index 5ca8bd62d6..ba87c7596c 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -380,8 +380,8 @@ void wxScrolledWindow::AdjustScrollbars() } else { - m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; - m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine); + m_hAdjust->upper = vw / m_xScrollPixelsPerLine; + m_hAdjust->page_increment = w / m_xScrollPixelsPerLine; m_hAdjust->page_size = m_hAdjust->page_increment; // If the scrollbar hits the right side, move the window @@ -408,8 +408,8 @@ void wxScrolledWindow::AdjustScrollbars() } else { - m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; - m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine); + m_vAdjust->upper = vh / m_yScrollPixelsPerLine; + m_vAdjust->page_increment = h / m_yScrollPixelsPerLine; m_vAdjust->page_size = m_vAdjust->page_increment; if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper)) diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp index 5ca8bd62d6..ba87c7596c 100644 --- a/src/gtk1/scrolwin.cpp +++ b/src/gtk1/scrolwin.cpp @@ -380,8 +380,8 @@ void wxScrolledWindow::AdjustScrollbars() } else { - m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; - m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine); + m_hAdjust->upper = vw / m_xScrollPixelsPerLine; + m_hAdjust->page_increment = w / m_xScrollPixelsPerLine; m_hAdjust->page_size = m_hAdjust->page_increment; // If the scrollbar hits the right side, move the window @@ -408,8 +408,8 @@ void wxScrolledWindow::AdjustScrollbars() } else { - m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; - m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine); + m_vAdjust->upper = vh / m_yScrollPixelsPerLine; + m_vAdjust->page_increment = h / m_yScrollPixelsPerLine; m_vAdjust->page_size = m_vAdjust->page_increment; if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper)) -- 2.45.2