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

renamed wxScrollHelper::GetRect() to GetScrollRect() to avoid conflicts with wxWindow method

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-08 21:17:56 +00:00
parent 510b9edbb6
commit d5d58a93c3
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/scrolwin.h
View File

@@ -146,7 +146,7 @@ public:
protected: protected:
// get pointer to our scroll rect if we use it or NULL // get pointer to our scroll rect if we use it or NULL
const wxRect *GetRect() const const wxRect *GetScrollRect() const
{ {
return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL; return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
} }

22
src/generic/scrlwing.cpp
View File

@@ -358,7 +358,7 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
m_targetWindow->SetVirtualSize( w, h ); m_targetWindow->SetVirtualSize( w, h );
if (do_refresh && !noRefresh) if (do_refresh && !noRefresh)
m_targetWindow->Refresh(TRUE, GetRect()); m_targetWindow->Refresh(TRUE, GetScrollRect());
// TODO: check if we can use AdjustScrollbars always. // TODO: check if we can use AdjustScrollbars always.
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
@@ -488,11 +488,11 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
if ( needsRefresh ) if ( needsRefresh )
{ {
m_targetWindow->Refresh(TRUE, GetRect()); m_targetWindow->Refresh(TRUE, GetScrollRect());
} }
else else
{ {
m_targetWindow->ScrollWindow(dx, dy, GetRect()); m_targetWindow->ScrollWindow(dx, dy, GetScrollRect());
} }
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -569,7 +569,7 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
} }
else else
m_targetWindow->Refresh(TRUE, GetRect()); m_targetWindow->Refresh(TRUE, GetScrollRect());
} }
else else
{ {
@@ -593,7 +593,7 @@ int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
else else
{ {
// VZ: why do we do this? (FIXME) // VZ: why do we do this? (FIXME)
m_targetWindow->Refresh(TRUE, GetRect()); m_targetWindow->Refresh(TRUE, GetScrollRect());
} }
} }
@@ -743,18 +743,18 @@ void wxScrollHelper::AdjustScrollbars()
{ {
if (m_xScrollingEnabled) if (m_xScrollingEnabled)
m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0, m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0,
GetRect() ); GetScrollRect() );
else else
m_targetWindow->Refresh(TRUE, GetRect()); m_targetWindow->Refresh(TRUE, GetScrollRect());
} }
if (oldYScroll != m_yScrollPosition) if (oldYScroll != m_yScrollPosition)
{ {
if (m_yScrollingEnabled) if (m_yScrollingEnabled)
m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition), m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition),
GetRect() ); GetScrollRect() );
else else
m_targetWindow->Refresh(TRUE, GetRect()); m_targetWindow->Refresh(TRUE, GetScrollRect());
} }
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -848,7 +848,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
if (old_x != m_xScrollPosition) { if (old_x != m_xScrollPosition) {
m_win->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() ); GetScrollRect() );
} }
} }
if ((y_pos != -1) && (m_yScrollPixelsPerLine)) if ((y_pos != -1) && (m_yScrollPixelsPerLine))
@@ -869,7 +869,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
if (old_y != m_yScrollPosition) { if (old_y != m_yScrollPosition) {
m_win->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() ); GetScrollRect() );
} }
} }