From 5f3286d17d6f65c3acddabb45545c2ef1b0d9b20 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Dec 2001 15:57:36 +0000 Subject: [PATCH] more fixes to target window scrolling git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/scrollsub/scrollsub.cpp | 60 ++++++++++++++++----------------- src/generic/scrlwing.cpp | 20 +++++------ src/msw/window.cpp | 31 +++++------------ 3 files changed, 49 insertions(+), 62 deletions(-) diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp index 6c8b3fe8b7..c7ce613e4e 100644 --- a/samples/scrollsub/scrollsub.cpp +++ b/samples/scrollsub/scrollsub.cpp @@ -55,12 +55,12 @@ class MyTopLabels: public wxWindow public: MyTopLabels() {} MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); - + void OnPaint( wxPaintEvent &event ); - + private: wxScrolledWindow *m_owner; - + DECLARE_DYNAMIC_CLASS(MyTopLabels) DECLARE_EVENT_TABLE() }; @@ -72,12 +72,12 @@ class MyRightLabels: public wxWindow public: MyRightLabels() {} MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); - + void OnPaint( wxPaintEvent &event ); - + private: wxScrolledWindow *m_owner; - + DECLARE_DYNAMIC_CLASS(MyRightLabels) DECLARE_EVENT_TABLE() }; @@ -150,25 +150,25 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id, MyRightLabels *right = new MyRightLabels( this, -1, wxDefaultPosition, wxSize(60,-1) ); m_canvas = new MyCanvas( this, top, right, -1, wxDefaultPosition, wxDefaultSize ); - + SetTargetWindow( m_canvas ); SetBackgroundColour( wxT("WHEAT") ); - + SetCursor( wxCursor( wxCURSOR_HAND ) ); - + wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL ); topsizer->Add( 60,25 ); - topsizer->Add( top, 1 ); - + topsizer->Add( top, 1, wxEXPAND ); + mainsizer->Add( topsizer, 0, wxEXPAND ); - + wxBoxSizer *middlesizer = new wxBoxSizer( wxHORIZONTAL ); middlesizer->Add( right, 0, wxEXPAND ); middlesizer->Add( m_canvas, 1, wxEXPAND ); - + mainsizer->Add( middlesizer, 1, wxEXPAND ); SetAutoLayout( TRUE ); @@ -185,7 +185,7 @@ void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) /* wxSize size( GetClientSize() ); - + long w,h; dc.GetTextExtent( wxT("Headline"), &w, &h ); @@ -257,15 +257,15 @@ MyCanvas::MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *r m_owner = parent; m_topLabels = top; m_rightLabels = right; - + (void)new wxButton( this, -1, "Hallo I", wxPoint(0,50), wxSize(100,25) ); (void)new wxButton( this, -1, "Hallo II", wxPoint(200,50), wxSize(100,25) ); - + (void)new wxTextCtrl( this, -1, "Text I", wxPoint(0,100), wxSize(100,25) ); (void)new wxTextCtrl( this, -1, "Text II", wxPoint(200,100), wxSize(100,25) ); SetBackgroundColour( wxT("WHEAT") ); - + SetCursor( wxCursor( wxCURSOR_IBEAM ) ); } @@ -279,27 +279,27 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) m_owner->PrepareDC( dc ); dc.SetPen( *wxBLACK_PEN ); - + // OK, let's assume we are a grid control and we have two // grid cells. Here in OnPaint we want to know which cell // to redraw so that we prevent redrawing cells that don't // need to get redrawn. We have one cell at (0,0) and one // more at (200,0), both having a size of (100,25). - - // We can query how much the window has been scrolled + + // We can query how much the window has been scrolled // by calling CalcUnscrolledPosition() - + int scroll_x = 0; int scroll_y = 0; m_owner->CalcUnscrolledPosition( scroll_x, scroll_y, &scroll_x, &scroll_y ); - + // We also need to know the size of the window to see which // cells are completely hidden and not get redrawn - + int size_x = 0; int size_y = 0; GetClientSize( &size_x, &size_y ); - + // First cell: (0,0)(100,25) // It it on screen? if ((0+100-scroll_x > 0) && (0+25-scroll_y > 0) && @@ -313,8 +313,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText( "First Cell", 5, 5 ); } } - - + + // Second cell: (0,200)(100,25) // It it on screen? if ((200+100-scroll_x > 0) && (0+25-scroll_y > 0) && @@ -328,7 +328,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText( "Second Cell", 205, 5 ); } } - + } void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect ) @@ -372,11 +372,11 @@ MyFrame::MyFrame() m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) ); m_scrolled->SetScrollbars( 10, 10, 50, 100 ); - + m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE ); wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) ); delete old_log; - + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); topsizer->Add( m_scrolled, 1, wxEXPAND ); topsizer->Add( m_log, 0, wxEXPAND ); diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 8aec5d087e..25fcf9048a 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -454,12 +454,12 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event) if (orient == wxHORIZONTAL) { m_xScrollPosition += nScrollInc; - m_targetWindow->SetScrollPos(wxHORIZONTAL, m_xScrollPosition); + m_win->SetScrollPos(wxHORIZONTAL, m_xScrollPosition); } else { m_yScrollPosition += nScrollInc; - m_targetWindow->SetScrollPos(wxVERTICAL, m_yScrollPosition); + m_win->SetScrollPos(wxVERTICAL, m_yScrollPosition); } bool needsRefresh = FALSE; @@ -624,14 +624,14 @@ void wxScrollHelper::AdjustScrollbars() m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, 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 SetScrollPageSize(wxHORIZONTAL, noPagePositions); } else { m_xScrollPosition = 0; - m_targetWindow->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE); + m_win->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE); } if (m_yScrollLines > 0) @@ -648,14 +648,14 @@ void wxScrollHelper::AdjustScrollbars() m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, 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 SetScrollPageSize(wxVERTICAL, noPagePositions); } else { m_yScrollPosition = 0; - m_targetWindow->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); + m_win->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); } if (oldXScroll != m_xScrollPosition) @@ -747,7 +747,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos ) m_xScrollPosition = wxMax( 0, 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, GetRect() ); } @@ -768,7 +768,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos ) m_yScrollPosition = wxMax( 0, 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, GetRect() ); } @@ -827,8 +827,8 @@ void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) cons void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event)) { #if wxUSE_CONSTRAINTS - if ( m_targetWindow->GetAutoLayout() ) - m_targetWindow->Layout(); + if ( m_win->GetAutoLayout() ) + m_win->Layout(); #endif AdjustScrollbars(); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 02ba75ec10..5b4cbc254a 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -825,36 +825,23 @@ int wxWindowMSW::GetScrollThumb(int orient) const void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh) { -#if defined(__WIN95__) - SCROLLINFO info; - int dir; + HWND hWnd = GetHwnd(); + wxCHECK_RET( hWnd, _T("SetScrollPos: no HWND") ); - if ( orient == wxHORIZONTAL ) { - dir = SB_HORZ; - } else { - dir = SB_VERT; - } + int dir = orient == wxHORIZONTAL ? SB_HORZ : SB_VERT; +#if defined(__WIN95__) + SCROLLINFO info; info.cbSize = sizeof(SCROLLINFO); info.nPage = 0; info.nMin = 0; info.nPos = pos; info.fMask = SIF_POS; - HWND hWnd = GetHwnd(); - if ( hWnd ) - ::SetScrollInfo(hWnd, dir, &info, refresh); -#else - int wOrient; - if ( orient == wxHORIZONTAL ) - wOrient = SB_HORZ; - else - wOrient = SB_VERT; - - HWND hWnd = GetHwnd(); - if ( hWnd ) - ::SetScrollPos(hWnd, wOrient, pos, refresh); -#endif + ::SetScrollInfo(hWnd, dir, &info, refresh); +#else // !__WIN95__ + ::SetScrollPos(hWnd, dir, pos, refresh); +#endif // __WIN95__/!__WIN95__ } // New function that will replace some of the above. -- 2.45.2