diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-02 14:57:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
commit | 04a8ba2084950f998d791edad29739c124c8c4b8 (patch) | |
tree | df1b3f1a5d5a56ff89300292ade6f6976e16b436 /vcl/source | |
parent | a1cd62bcd589a7c1050e327f4cb0ad95f9ea19d1 (diff) |
convert ScrollType to scoped enum
Change-Id: I6dd02d4f7df028dada6cfd5d767a6ec1b1c1efe1
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/control/scrbar.cxx | 58 | ||||
-rw-r--r-- | vcl/source/control/slider.cxx | 66 | ||||
-rw-r--r-- | vcl/source/edit/vclmedit.cxx | 12 |
3 files changed, 68 insertions, 68 deletions
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index b4abe08a4de9..5ac987e5dd8b 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -89,7 +89,7 @@ void ScrollBar::ImplInit( vcl::Window* pParent, WinBits nStyle ) mnDelta = 0; mnDragDraw = 0; mnStateFlags = 0; - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; mbCalcSize = true; mbFullDrag = false; @@ -724,19 +724,19 @@ long ScrollBar::ImplDoAction( bool bCallEndScroll ) switch ( meScrollType ) { - case SCROLL_LINEUP: + case ScrollType::LineUp: nDelta = ImplScroll( mnThumbPos-mnLineSize, bCallEndScroll ); break; - case SCROLL_LINEDOWN: + case ScrollType::LineDown: nDelta = ImplScroll( mnThumbPos+mnLineSize, bCallEndScroll ); break; - case SCROLL_PAGEUP: + case ScrollType::PageUp: nDelta = ImplScroll( mnThumbPos-mnPageSize, bCallEndScroll ); break; - case SCROLL_PAGEDOWN: + case ScrollType::PageDown: nDelta = ImplScroll( mnThumbPos+mnPageSize, bCallEndScroll ); break; default: @@ -758,7 +758,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) switch ( meScrollType ) { - case SCROLL_LINEUP: + case ScrollType::LineUp: if ( HitTestNativeControl( ControlType::Scrollbar, bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rMousePos, bIsInside )? bIsInside: @@ -771,7 +771,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) mnStateFlags &= ~SCRBAR_STATE_BTN1_DOWN; break; - case SCROLL_LINEDOWN: + case ScrollType::LineDown: if ( HitTestNativeControl( ControlType::Scrollbar, bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rMousePos, bIsInside )? bIsInside: @@ -784,7 +784,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) mnStateFlags &= ~SCRBAR_STATE_BTN2_DOWN; break; - case SCROLL_PAGEUP: + case ScrollType::PageUp: // HitTestNativeControl, see remark at top of file if ( HitTestNativeControl( ControlType::Scrollbar, bHorizontal? ControlPart::TrackHorzLeft: ControlPart::TrackVertUpper, maPage1Rect, rMousePos, bIsInside )? @@ -798,7 +798,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) mnStateFlags &= ~SCRBAR_STATE_PAGE1_DOWN; break; - case SCROLL_PAGEDOWN: + case ScrollType::PageDown: // HitTestNativeControl, see remark at top of file if ( HitTestNativeControl( ControlType::Scrollbar, bHorizontal? ControlPart::TrackHorzRight: ControlPart::TrackVertLower, maPage2Rect, rMousePos, bIsInside )? @@ -892,7 +892,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) ) { nTrackFlags = StartTrackingFlags::ButtonRepeat; - meScrollType = SCROLL_LINEUP; + meScrollType = ScrollType::LineUp; mnDragDraw = SCRBAR_DRAW_BTN1; } } @@ -904,7 +904,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) ) { nTrackFlags = StartTrackingFlags::ButtonRepeat; - meScrollType = SCROLL_LINEDOWN; + meScrollType = ScrollType::LineDown; mnDragDraw = SCRBAR_DRAW_BTN2; } } @@ -932,7 +932,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( mnVisibleSize < mnMaxRange-mnMinRange ) { nTrackFlags = StartTrackingFlags::NONE; - meScrollType = SCROLL_DRAG; + meScrollType = ScrollType::Drag; mnDragDraw = SCRBAR_DRAW_THUMB; // calculate mouse offset @@ -968,19 +968,19 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) bIsInside: maPage1Rect.IsInside( rMousePos ) ) { - meScrollType = SCROLL_PAGEUP; + meScrollType = ScrollType::PageUp; mnDragDraw = SCRBAR_DRAW_PAGE1; } else { - meScrollType = SCROLL_PAGEDOWN; + meScrollType = ScrollType::PageDown; mnDragDraw = SCRBAR_DRAW_PAGE2; } } } // Should we start Tracking? - if ( meScrollType != SCROLL_DONTKNOW ) + if ( meScrollType != ScrollType::DontKnow ) { // store original position for cancel and EndScroll delta mnStartPos = mnThumbPos; @@ -1018,7 +1018,7 @@ void ScrollBar::Tracking( const TrackingEvent& rTEvt ) Scroll(); } - if ( meScrollType == SCROLL_DRAG ) + if ( meScrollType == ScrollType::Drag ) { // On a SCROLLDRAG we recalculate the Thumb, so that it's back to a // rounded ThumbPosition @@ -1035,7 +1035,7 @@ void ScrollBar::Tracking( const TrackingEvent& rTEvt ) mnDelta = mnThumbPos-mnStartPos; EndScroll(); mnDelta = 0; - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; if( mpData ) mpData->mbHide = false; // re-enable focus blinking @@ -1057,7 +1057,7 @@ void ScrollBar::Tracking( const TrackingEvent& rTEvt ) const Point rMousePos = (GetMapMode().GetMapUnit() != MAP_TWIP ? rTEvt.GetMouseEvent().GetPosPixel() : aPosPixel); // Dragging is treated in a special way - if ( meScrollType == SCROLL_DRAG ) + if ( meScrollType == ScrollType::Drag ) ImplDragThumb( rMousePos ); else ImplDoMouseAction( rMousePos, rTEvt.IsTrackingRepeat() ); @@ -1085,20 +1085,20 @@ void ScrollBar::KeyInput( const KeyEvent& rKEvt ) case KEY_LEFT: case KEY_UP: - DoScrollAction( SCROLL_LINEUP ); + DoScrollAction( ScrollType::LineUp ); break; case KEY_RIGHT: case KEY_DOWN: - DoScrollAction( SCROLL_LINEDOWN ); + DoScrollAction( ScrollType::LineDown ); break; case KEY_PAGEUP: - DoScrollAction( SCROLL_PAGEUP ); + DoScrollAction( ScrollType::PageUp ); break; case KEY_PAGEDOWN: - DoScrollAction( SCROLL_PAGEDOWN ); + DoScrollAction( ScrollType::PageDown ); break; default: @@ -1323,26 +1323,26 @@ void ScrollBar::EndScroll() long ScrollBar::DoScroll( long nNewPos ) { - if ( meScrollType != SCROLL_DONTKNOW ) + if ( meScrollType != ScrollType::DontKnow ) return 0; SAL_INFO("vcl.scrollbar", "DoScroll(" << nNewPos << ")"); - meScrollType = SCROLL_DRAG; + meScrollType = ScrollType::Drag; long nDelta = ImplScroll( nNewPos, true ); - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; return nDelta; } long ScrollBar::DoScrollAction( ScrollType eScrollType ) { - if ( (meScrollType != SCROLL_DONTKNOW) || - (eScrollType == SCROLL_DONTKNOW) || - (eScrollType == SCROLL_DRAG) ) + if ( (meScrollType != ScrollType::DontKnow) || + (eScrollType == ScrollType::DontKnow) || + (eScrollType == ScrollType::Drag) ) return 0; meScrollType = eScrollType; long nDelta = ImplDoAction( true ); - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; return nDelta; } diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index a59eb77bc4e4..1c38fbe65e3a 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -56,7 +56,7 @@ void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle ) mnPageSize = 1; mnDelta = 0; mnStateFlags = 0; - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; mbCalcSize = true; mbFullDrag = true; @@ -505,23 +505,23 @@ long Slider::ImplDoAction( bool bCallEndSlide ) switch ( meScrollType ) { - case SCROLL_LINEUP: + case ScrollType::LineUp: nDelta = ImplSlide( mnThumbPos-mnLineSize, bCallEndSlide ); break; - case SCROLL_LINEDOWN: + case ScrollType::LineDown: nDelta = ImplSlide( mnThumbPos+mnLineSize, bCallEndSlide ); break; - case SCROLL_PAGEUP: + case ScrollType::PageUp: nDelta = ImplSlide( mnThumbPos-mnPageSize, bCallEndSlide ); break; - case SCROLL_PAGEDOWN: + case ScrollType::PageDown: nDelta = ImplSlide( mnThumbPos+mnPageSize, bCallEndSlide ); break; - case SCROLL_SET: + case ScrollType::Set: nDelta = ImplSlide( ImplCalcThumbPos( GetPointerPosPixel().X() ), bCallEndSlide ); break; default: @@ -538,7 +538,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) switch ( meScrollType ) { - case SCROLL_SET: + case ScrollType::Set: { const bool bUp = ImplIsPageUp( rMousePos ), bDown = ImplIsPageDown( rMousePos ); @@ -552,7 +552,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) break; } - case SCROLL_PAGEUP: + case ScrollType::PageUp: if ( ImplIsPageUp( rMousePos ) ) { bAction = bCallAction; @@ -562,7 +562,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) mnStateFlags &= ~SLIDER_STATE_CHANNEL1_DOWN; break; - case SCROLL_PAGEDOWN: + case ScrollType::PageDown: if ( ImplIsPageDown( rMousePos ) ) { bAction = bCallAction; @@ -591,24 +591,24 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) void Slider::ImplDoSlide( long nNewPos ) { - if ( meScrollType != SCROLL_DONTKNOW ) + if ( meScrollType != ScrollType::DontKnow ) return; - meScrollType = SCROLL_DRAG; + meScrollType = ScrollType::Drag; ImplSlide( nNewPos, true ); - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; } void Slider::ImplDoSlideAction( ScrollType eScrollType ) { - if ( (meScrollType != SCROLL_DONTKNOW) || - (eScrollType == SCROLL_DONTKNOW) || - (eScrollType == SCROLL_DRAG) ) + if ( (meScrollType != ScrollType::DontKnow) || + (eScrollType == ScrollType::DontKnow) || + (eScrollType == ScrollType::Drag) ) return; meScrollType = eScrollType; ImplDoAction( true ); - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; } void Slider::MouseButtonDown( const MouseEvent& rMEvt ) @@ -620,7 +620,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) if ( maThumbRect.IsInside( rMousePos ) ) { - meScrollType = SCROLL_DRAG; + meScrollType = ScrollType::Drag; // calculate additional values Point aCenterPos = maThumbRect.Center(); @@ -632,33 +632,33 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) else if ( ImplIsPageUp( rMousePos ) ) { if( GetStyle() & WB_SLIDERSET ) - meScrollType = SCROLL_SET; + meScrollType = ScrollType::Set; else { nTrackFlags = StartTrackingFlags::ButtonRepeat; - meScrollType = SCROLL_PAGEUP; + meScrollType = ScrollType::PageUp; } } else if ( ImplIsPageDown( rMousePos ) ) { if( GetStyle() & WB_SLIDERSET ) - meScrollType = SCROLL_SET; + meScrollType = ScrollType::Set; else { nTrackFlags = StartTrackingFlags::ButtonRepeat; - meScrollType = SCROLL_PAGEDOWN; + meScrollType = ScrollType::PageDown; } } // Shall we start Tracking? - if( meScrollType != SCROLL_DONTKNOW ) + if( meScrollType != ScrollType::DontKnow ) { // store Start position for cancel and EndScroll delta mnStartPos = mnThumbPos; - ImplDoMouseAction( rMousePos, meScrollType != SCROLL_SET ); + ImplDoMouseAction( rMousePos, meScrollType != ScrollType::Set ); Update(); - if( meScrollType != SCROLL_SET ) + if( meScrollType != ScrollType::Set ) StartTracking( nTrackFlags ); } } @@ -666,7 +666,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) void Slider::MouseButtonUp( const MouseEvent& ) { - if( SCROLL_SET == meScrollType ) + if( ScrollType::Set == meScrollType ) { // reset Button and PageRect state const sal_uInt16 nOldStateFlags = mnStateFlags; @@ -678,7 +678,7 @@ void Slider::MouseButtonUp( const MouseEvent& ) Invalidate(InvalidateFlags::NoChildren | InvalidateFlags::NoErase); } ImplDoAction( true ); - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; } } @@ -704,7 +704,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt ) Slide(); } - if ( meScrollType == SCROLL_DRAG ) + if ( meScrollType == ScrollType::Drag ) { // after dragging, recalculate to a rounded Thumb position ImplCalc(); @@ -721,14 +721,14 @@ void Slider::Tracking( const TrackingEvent& rTEvt ) mnDelta = mnThumbPos-mnStartPos; EndSlide(); mnDelta = 0; - meScrollType = SCROLL_DONTKNOW; + meScrollType = ScrollType::DontKnow; } else { const Point rMousePos = rTEvt.GetMouseEvent().GetPosPixel(); // special handling for dragging - if ( meScrollType == SCROLL_DRAG ) + if ( meScrollType == ScrollType::Drag ) { long nMovePix; Point aCenterPos = maThumbRect.Center(); @@ -784,20 +784,20 @@ void Slider::KeyInput( const KeyEvent& rKEvt ) case KEY_LEFT: case KEY_UP: - ImplDoSlideAction( SCROLL_LINEUP ); + ImplDoSlideAction( ScrollType::LineUp ); break; case KEY_RIGHT: case KEY_DOWN: - ImplDoSlideAction( SCROLL_LINEDOWN ); + ImplDoSlideAction( ScrollType::LineDown ); break; case KEY_PAGEUP: - ImplDoSlideAction( SCROLL_PAGEUP ); + ImplDoSlideAction( ScrollType::PageUp ); break; case KEY_PAGEDOWN: - ImplDoSlideAction( SCROLL_PAGEDOWN ); + ImplDoSlideAction( ScrollType::PageDown ); break; default: diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 3079dbd33c70..97ab7557c04b 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1467,37 +1467,37 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) case KEY_UP: { if ( pImpVclMEdit->GetVScrollBar() ) - pImpVclMEdit->GetVScrollBar()->DoScrollAction( SCROLL_LINEUP ); + pImpVclMEdit->GetVScrollBar()->DoScrollAction( ScrollType::LineUp ); } break; case KEY_DOWN: { if ( pImpVclMEdit->GetVScrollBar() ) - pImpVclMEdit->GetVScrollBar()->DoScrollAction( SCROLL_LINEDOWN ); + pImpVclMEdit->GetVScrollBar()->DoScrollAction( ScrollType::LineDown ); } break; case KEY_PAGEUP : { if ( pImpVclMEdit->GetVScrollBar() ) - pImpVclMEdit->GetVScrollBar()->DoScrollAction( SCROLL_PAGEUP ); + pImpVclMEdit->GetVScrollBar()->DoScrollAction( ScrollType::PageUp ); } break; case KEY_PAGEDOWN: { if ( pImpVclMEdit->GetVScrollBar() ) - pImpVclMEdit->GetVScrollBar()->DoScrollAction( SCROLL_PAGEDOWN ); + pImpVclMEdit->GetVScrollBar()->DoScrollAction( ScrollType::PageDown ); } break; case KEY_LEFT: { if ( pImpVclMEdit->GetHScrollBar() ) - pImpVclMEdit->GetHScrollBar()->DoScrollAction( SCROLL_LINEUP ); + pImpVclMEdit->GetHScrollBar()->DoScrollAction( ScrollType::LineUp ); } break; case KEY_RIGHT: { if ( pImpVclMEdit->GetHScrollBar() ) - pImpVclMEdit->GetHScrollBar()->DoScrollAction( SCROLL_LINEDOWN ); + pImpVclMEdit->GetHScrollBar()->DoScrollAction( ScrollType::LineDown ); } break; case KEY_HOME: |