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

more fixes to target window scrolling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-02 15:57:36 +00:00
parent af4088f1be
commit 5f3286d17d
3 changed files with 49 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/scrollsub/scrollsub.cpp
View File

@@ -161,7 +161,7 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
topsizer->Add( 60,25 ); topsizer->Add( 60,25 );
topsizer->Add( top, 1 ); topsizer->Add( top, 1, wxEXPAND );
mainsizer->Add( topsizer, 0, wxEXPAND ); mainsizer->Add( topsizer, 0, wxEXPAND );

20
src/generic/scrlwing.cpp
View File

@@ -454,12 +454,12 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
if (orient == wxHORIZONTAL) if (orient == wxHORIZONTAL)
{ {
m_xScrollPosition += nScrollInc; m_xScrollPosition += nScrollInc;
m_targetWindow->SetScrollPos(wxHORIZONTAL, m_xScrollPosition); m_win->SetScrollPos(wxHORIZONTAL, m_xScrollPosition);
} }
else else
{ {
m_yScrollPosition += nScrollInc; m_yScrollPosition += nScrollInc;
m_targetWindow->SetScrollPos(wxVERTICAL, m_yScrollPosition); m_win->SetScrollPos(wxVERTICAL, m_yScrollPosition);
} }
bool needsRefresh = FALSE; bool needsRefresh = FALSE;
@@ -624,14 +624,14 @@ void wxScrollHelper::AdjustScrollbars()
m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition); m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition);
m_xScrollPosition = wxMax( 0, m_xScrollPosition ); m_xScrollPosition = wxMax( 0, m_xScrollPosition );
m_targetWindow->SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines); m_win->SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
// The amount by which we scroll when paging // The amount by which we scroll when paging
SetScrollPageSize(wxHORIZONTAL, noPagePositions); SetScrollPageSize(wxHORIZONTAL, noPagePositions);
} }
else else
{ {
m_xScrollPosition = 0; m_xScrollPosition = 0;
m_targetWindow->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE); m_win->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE);
} }
if (m_yScrollLines > 0) if (m_yScrollLines > 0)
@@ -648,14 +648,14 @@ void wxScrollHelper::AdjustScrollbars()
m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition ); m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
m_yScrollPosition = wxMax( 0, m_yScrollPosition ); m_yScrollPosition = wxMax( 0, m_yScrollPosition );
m_targetWindow->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines); m_win->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
// The amount by which we scroll when paging // The amount by which we scroll when paging
SetScrollPageSize(wxVERTICAL, noPagePositions); SetScrollPageSize(wxVERTICAL, noPagePositions);
} }
else else
{ {
m_yScrollPosition = 0; m_yScrollPosition = 0;
m_targetWindow->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); m_win->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);
} }
if (oldXScroll != m_xScrollPosition) if (oldXScroll != m_xScrollPosition)
@@ -747,7 +747,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
m_xScrollPosition = wxMax( 0, m_xScrollPosition ); m_xScrollPosition = wxMax( 0, m_xScrollPosition );
if (old_x != m_xScrollPosition) { if (old_x != m_xScrollPosition) {
m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition ); m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0, m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0,
GetRect() ); GetRect() );
} }
@@ -768,7 +768,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
m_yScrollPosition = wxMax( 0, m_yScrollPosition ); m_yScrollPosition = wxMax( 0, m_yScrollPosition );
if (old_y != m_yScrollPosition) { if (old_y != m_yScrollPosition) {
m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition ); m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition );
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine, m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine,
GetRect() ); GetRect() );
} }
@@ -827,8 +827,8 @@ void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) cons
void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event)) void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
{ {
#if wxUSE_CONSTRAINTS #if wxUSE_CONSTRAINTS
if ( m_targetWindow->GetAutoLayout() ) if ( m_win->GetAutoLayout() )
m_targetWindow->Layout(); m_win->Layout();
#endif #endif
AdjustScrollbars(); AdjustScrollbars();

29
src/msw/window.cpp
View File

@@ -825,36 +825,23 @@ int wxWindowMSW::GetScrollThumb(int orient) const
void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh) void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh)
{ {
HWND hWnd = GetHwnd();
wxCHECK_RET( hWnd, _T("SetScrollPos: no HWND") );
int dir = orient == wxHORIZONTAL ? SB_HORZ : SB_VERT;
#if defined(__WIN95__) #if defined(__WIN95__)
SCROLLINFO info; SCROLLINFO info;
int dir;
if ( orient == wxHORIZONTAL ) {
dir = SB_HORZ;
} else {
dir = SB_VERT;
}
info.cbSize = sizeof(SCROLLINFO); info.cbSize = sizeof(SCROLLINFO);
info.nPage = 0; info.nPage = 0;
info.nMin = 0; info.nMin = 0;
info.nPos = pos; info.nPos = pos;
info.fMask = SIF_POS; info.fMask = SIF_POS;
HWND hWnd = GetHwnd();
if ( hWnd )
::SetScrollInfo(hWnd, dir, &info, refresh); ::SetScrollInfo(hWnd, dir, &info, refresh);
#else #else // !__WIN95__
int wOrient; ::SetScrollPos(hWnd, dir, pos, refresh);
if ( orient == wxHORIZONTAL ) #endif // __WIN95__/!__WIN95__
wOrient = SB_HORZ;
else
wOrient = SB_VERT;
HWND hWnd = GetHwnd();
if ( hWnd )
::SetScrollPos(hWnd, wOrient, pos, refresh);
#endif
} }
// New function that will replace some of the above. // New function that will replace some of the above.