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

naming corrections, scrolling amount fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-01-20 16:23:47 +00:00
parent 4b0b35f185
commit 4b1c4c2181
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/carbon/scrolbar.cpp
View File

@@ -72,11 +72,11 @@ int wxScrollBar::GetThumbPosition() const
void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
bool refresh) bool refresh)
{ {
m_viewSize = pageSize; m_pageSize = pageSize;
m_pageSize = thumbSize; m_viewSize = thumbSize;
m_objectSize = range; m_objectSize = range;
int range1 = wxMax((m_objectSize - m_pageSize), 0) ; int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
SetControlMaximum( (ControlHandle) m_macControl , range1 ) ; SetControlMaximum( (ControlHandle) m_macControl , range1 ) ;
SetControlMinimum( (ControlHandle) m_macControl , 0 ) ; SetControlMinimum( (ControlHandle) m_macControl , 0 ) ;
@@ -86,7 +86,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
{ {
if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress ) if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{ {
SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ; SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
} }
} }
if ( refresh ) if ( refresh )
@@ -115,19 +115,19 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
switch( controlpart ) switch( controlpart )
{ {
case kControlUpButtonPart : case kControlUpButtonPart :
nScrollInc = -m_pageSize; nScrollInc = -1;
scrollEvent = wxEVT_SCROLL_LINEUP; scrollEvent = wxEVT_SCROLL_LINEUP;
break ; break ;
case kControlDownButtonPart : case kControlDownButtonPart :
nScrollInc = m_pageSize; nScrollInc = 1;
scrollEvent = wxEVT_SCROLL_LINEDOWN; scrollEvent = wxEVT_SCROLL_LINEDOWN;
break ; break ;
case kControlPageUpPart : case kControlPageUpPart :
nScrollInc = -m_viewSize; nScrollInc = -m_pageSize;
scrollEvent = wxEVT_SCROLL_PAGEUP; scrollEvent = wxEVT_SCROLL_PAGEUP;
break ; break ;
case kControlPageDownPart : case kControlPageDownPart :
nScrollInc = m_viewSize; nScrollInc = m_pageSize;
scrollEvent = wxEVT_SCROLL_PAGEDOWN; scrollEvent = wxEVT_SCROLL_PAGEDOWN;
break ; break ;
case kControlIndicatorPart : case kControlIndicatorPart :

16
src/mac/scrolbar.cpp
View File

@@ -72,11 +72,11 @@ int wxScrollBar::GetThumbPosition() const
void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
bool refresh) bool refresh)
{ {
m_viewSize = pageSize; m_pageSize = pageSize;
m_pageSize = thumbSize; m_viewSize = thumbSize;
m_objectSize = range; m_objectSize = range;
int range1 = wxMax((m_objectSize - m_pageSize), 0) ; int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
SetControlMaximum( (ControlHandle) m_macControl , range1 ) ; SetControlMaximum( (ControlHandle) m_macControl , range1 ) ;
SetControlMinimum( (ControlHandle) m_macControl , 0 ) ; SetControlMinimum( (ControlHandle) m_macControl , 0 ) ;
@@ -86,7 +86,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
{ {
if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress ) if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{ {
SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ; SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
} }
} }
if ( refresh ) if ( refresh )
@@ -115,19 +115,19 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
switch( controlpart ) switch( controlpart )
{ {
case kControlUpButtonPart : case kControlUpButtonPart :
nScrollInc = -m_pageSize; nScrollInc = -1;
scrollEvent = wxEVT_SCROLL_LINEUP; scrollEvent = wxEVT_SCROLL_LINEUP;
break ; break ;
case kControlDownButtonPart : case kControlDownButtonPart :
nScrollInc = m_pageSize; nScrollInc = 1;
scrollEvent = wxEVT_SCROLL_LINEDOWN; scrollEvent = wxEVT_SCROLL_LINEDOWN;
break ; break ;
case kControlPageUpPart : case kControlPageUpPart :
nScrollInc = -m_viewSize; nScrollInc = -m_pageSize;
scrollEvent = wxEVT_SCROLL_PAGEUP; scrollEvent = wxEVT_SCROLL_PAGEUP;
break ; break ;
case kControlPageDownPart : case kControlPageDownPart :
nScrollInc = m_viewSize; nScrollInc = m_pageSize;
scrollEvent = wxEVT_SCROLL_PAGEDOWN; scrollEvent = wxEVT_SCROLL_PAGEDOWN;
break ; break ;
case kControlIndicatorPart : case kControlIndicatorPart :