diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-27 15:09:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-28 12:47:07 +0200 |
commit | 79db3fc0ee41a6284eb2175a4780f4157cb708f6 (patch) | |
tree | 5a9fd718cd188bc3491f2f80758bbcd83fa2b342 /vcl/source/control | |
parent | a086ca18987a91543a65a3965b2bbc4c022400f8 (diff) |
convert STARTTRACK constants to scoped enum
Change-Id: I9b441688eb59ffd3540b014716a9abe7969c9be4
Diffstat (limited to 'vcl/source/control')
-rw-r--r-- | vcl/source/control/button.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/ilstbox.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/scrbar.cxx | 10 | ||||
-rw-r--r-- | vcl/source/control/slider.cxx | 9 |
5 files changed, 15 insertions, 16 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 9998c2292e03..b13ac6fd669f 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1200,17 +1200,17 @@ void PushButton::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.IsLeft() && ImplHitTestPushButton( this, rMEvt.GetPosPixel() ) ) { - sal_uInt16 nTrackFlags = 0; + StartTrackingFlags nTrackFlags = StartTrackingFlags::NONE; if ( ( GetStyle() & WB_REPEAT ) && ! ( GetStyle() & WB_TOGGLE ) ) - nTrackFlags |= STARTTRACK_BUTTONREPEAT; + nTrackFlags |= StartTrackingFlags::ButtonRepeat; ImplGetButtonState() |= DrawButtonFlags::Pressed; Invalidate(); StartTracking( nTrackFlags ); - if ( nTrackFlags & STARTTRACK_BUTTONREPEAT ) + if ( nTrackFlags & StartTrackingFlags::ButtonRepeat ) Click(); } } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e83ae507aa7d..9ff20ba8b47e 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1375,7 +1375,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) ImplSetCursorPos( nCharPos, rMEvt.IsShift() ); if ( !mbClickedInSelection && rMEvt.IsLeft() && ( rMEvt.GetClicks() == 1 ) ) - StartTracking( STARTTRACK_SCROLLREPEAT ); + StartTracking( StartTrackingFlags::ScrollRepeat ); } mbInMBDown = true; // then do not select all in GetFocus diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index f7d4592b7d4b..2cf7dfb9407a 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -859,7 +859,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) if ( mbGrabFocus ) GrabFocus(); - StartTracking( STARTTRACK_SCROLLREPEAT ); + StartTracking( StartTrackingFlags::ScrollRepeat ); } } if( rMEvt.GetClicks() == 2 ) @@ -946,7 +946,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) if ( mbStackMode && ( mpEntryList->GetSelectionAnchor() == LISTBOX_ENTRY_NOTFOUND ) ) mpEntryList->SetSelectionAnchor( 0 ); - StartTracking( STARTTRACK_SCROLLREPEAT ); + StartTracking( StartTrackingFlags::ScrollRepeat ); } } } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 2d7fdc3adb3e..699f8e87fc2c 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -898,7 +898,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if (rMEvt.IsLeft() || rMEvt.IsMiddle() || rMEvt.IsRight()) { const Point& rMousePos = rMEvt.GetPosPixel(); - sal_uInt16 nTrackFlags = 0; + StartTrackingFlags nTrackFlags = StartTrackingFlags::NONE; bool bHorizontal = ( GetStyle() & WB_HORZ ) != 0; bool bIsInside = false; bool bDragToMouse = false; @@ -913,7 +913,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) { if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) ) { - nTrackFlags = STARTTRACK_BUTTONREPEAT; + nTrackFlags = StartTrackingFlags::ButtonRepeat; meScrollType = SCROLL_LINEUP; mnDragDraw = SCRBAR_DRAW_BTN1; } @@ -925,7 +925,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) { if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) ) { - nTrackFlags = STARTTRACK_BUTTONREPEAT; + nTrackFlags = StartTrackingFlags::ButtonRepeat; meScrollType = SCROLL_LINEDOWN; mnDragDraw = SCRBAR_DRAW_BTN2; } @@ -953,7 +953,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( mnVisibleSize < mnMaxRange-mnMinRange ) { - nTrackFlags = 0; + nTrackFlags = StartTrackingFlags::NONE; meScrollType = SCROLL_DRAG; mnDragDraw = SCRBAR_DRAW_THUMB; @@ -982,7 +982,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) aControlRegion, rMousePos, bIsInside ) || bIsInside) ) { - nTrackFlags = STARTTRACK_BUTTONREPEAT; + nTrackFlags = StartTrackingFlags::ButtonRepeat; // HitTestNativeControl, see remark at top of file if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER, diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index f30e0c030244..db264ee6b703 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -658,12 +658,11 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) { - const Point& rMousePos = rMEvt.GetPosPixel(); - sal_uInt16 nTrackFlags = 0; + const Point& rMousePos = rMEvt.GetPosPixel(); + StartTrackingFlags nTrackFlags = StartTrackingFlags::NONE; if ( maThumbRect.IsInside( rMousePos ) ) { - nTrackFlags = 0; meScrollType = SCROLL_DRAG; mnDragDraw = SLIDER_DRAW_THUMB; @@ -680,7 +679,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) meScrollType = SCROLL_SET; else { - nTrackFlags = STARTTRACK_BUTTONREPEAT; + nTrackFlags = StartTrackingFlags::ButtonRepeat; meScrollType = SCROLL_PAGEUP; } @@ -692,7 +691,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) meScrollType = SCROLL_SET; else { - nTrackFlags = STARTTRACK_BUTTONREPEAT; + nTrackFlags = StartTrackingFlags::ButtonRepeat; meScrollType = SCROLL_PAGEDOWN; } |