cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed problem with missing refresh in wxScrolledWindow::

Browse Source 
SetScrollbars().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2001-07-26 11:32:03 +00:00
parent 1ff4714de0
commit ec7482df8b
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/scrolwin.cpp
View File

@ -241,12 +241,15 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY, int noUnitsX, int noUnitsY,
int xPos, int yPos, bool noRefresh ) int xPos, int yPos, bool noRefresh )
{ {
int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
m_xScrollPixelsPerLine = pixelsPerUnitX; m_xScrollPixelsPerLine = pixelsPerUnitX;
m_yScrollPixelsPerLine = pixelsPerUnitY; m_yScrollPixelsPerLine = pixelsPerUnitY;
m_xScrollPosition = xPos;
m_yScrollPosition = yPos;
m_xScrollLines = noUnitsX; m_xScrollLines = noUnitsX;
m_yScrollLines = noUnitsY; m_yScrollLines = noUnitsY;
m_xScrollPosition = xPos;
m_yScrollPosition = yPos;
m_hAdjust->lower = 0.0; m_hAdjust->lower = 0.0;
m_hAdjust->upper = noUnitsX; m_hAdjust->upper = noUnitsX;
@ -259,8 +262,16 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
m_vAdjust->value = yPos; m_vAdjust->value = yPos;
m_vAdjust->step_increment = 1.0; m_vAdjust->step_increment = 1.0;
m_vAdjust->page_increment = 2.0; m_vAdjust->page_increment = 2.0;
AdjustScrollbars(); AdjustScrollbars();
if (!noRefresh)
{
int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
int new_y = m_yScrollPixelsPerLine * m_yScrollPosition;
m_targetWindow->ScrollWindow( old_x-new_x, old_y-new_y );
}
} }
void wxScrolledWindow::AdjustScrollbars() void wxScrolledWindow::AdjustScrollbars()

17
src/gtk1/scrolwin.cpp
View File

@ -241,12 +241,15 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY, int noUnitsX, int noUnitsY,
int xPos, int yPos, bool noRefresh ) int xPos, int yPos, bool noRefresh )
{ {
int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
m_xScrollPixelsPerLine = pixelsPerUnitX; m_xScrollPixelsPerLine = pixelsPerUnitX;
m_yScrollPixelsPerLine = pixelsPerUnitY; m_yScrollPixelsPerLine = pixelsPerUnitY;
m_xScrollPosition = xPos;
m_yScrollPosition = yPos;
m_xScrollLines = noUnitsX; m_xScrollLines = noUnitsX;
m_yScrollLines = noUnitsY; m_yScrollLines = noUnitsY;
m_xScrollPosition = xPos;
m_yScrollPosition = yPos;
m_hAdjust->lower = 0.0; m_hAdjust->lower = 0.0;
m_hAdjust->upper = noUnitsX; m_hAdjust->upper = noUnitsX;
@ -259,8 +262,16 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
m_vAdjust->value = yPos; m_vAdjust->value = yPos;
m_vAdjust->step_increment = 1.0; m_vAdjust->step_increment = 1.0;
m_vAdjust->page_increment = 2.0; m_vAdjust->page_increment = 2.0;
AdjustScrollbars(); AdjustScrollbars();
if (!noRefresh)
{
int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
int new_y = m_yScrollPixelsPerLine * m_yScrollPosition;
m_targetWindow->ScrollWindow( old_x-new_x, old_y-new_y );
}
} }
void wxScrolledWindow::AdjustScrollbars() void wxScrolledWindow::AdjustScrollbars()