diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-27 14:05:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-28 12:47:06 +0200 |
commit | a086ca18987a91543a65a3965b2bbc4c022400f8 (patch) | |
tree | 77b2183d290cbdcb25f33d35b629da955ad3d035 /vcl | |
parent | 4c93c30c79ae885d488a8a04d383fe5308a1d520 (diff) |
convert AUTOSCROLL constants to scoped enum
Change-Id: Id1d2b5c13ad6af05314cba60ba5b9a62e0683f5e
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.cxx | 18 | ||||
-rw-r--r-- | vcl/source/window/window2.cxx | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index a54f6ccab113..59306f2f6328 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -196,7 +196,7 @@ struct ImplSVWinData ImageList* mpMsgBoxImgList; // ImageList for MessageBox VclPtr<vcl::Window> mpAutoScrollWin; // window, that is in AutoScrollMode mode sal_uInt16 mnTrackFlags; // tracking flags - sal_uInt16 mnAutoScrollFlags; // auto scroll flags + StartAutoScrollFlags mnAutoScrollFlags; // auto scroll flags bool mbNoDeactivate; // true: do not execute Deactivate bool mbNoSaveFocus; // true: menus must not save/restore focus bool mbNoSaveBackground; // true: save background is unnecessary or even less performant diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 8ddc748891e7..88e1cf1106d7 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -49,9 +49,9 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) : DBG_ASSERT( pParent, "ImplWheelWindow::ImplWheelWindow(): Parent not set!" ); const Size aSize( pParent->GetOutputSizePixel() ); - const sal_uInt16 nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; - const bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0; - const bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0; + const StartAutoScrollFlags nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; + const bool bHorz( nFlags & StartAutoScrollFlags::Horz ); + const bool bVert( nFlags & StartAutoScrollFlags::Vert ); // calculate maximum speed distance mnMaxWidth = (sal_uLong) ( 0.4 * hypot( (double) aSize.Width(), aSize.Height() ) ); @@ -237,9 +237,9 @@ void ImplWheelWindow::ImplRecalcScrollValues() PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY ) { PointerStyle eStyle; - const sal_uInt16 nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; - const bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0; - const bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0; + const StartAutoScrollFlags nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; + const bool bHorz( nFlags & StartAutoScrollFlags::Horz ); + const bool bVert( nFlags & StartAutoScrollFlags::Vert ); if( bHorz || bVert ) { @@ -316,9 +316,9 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) mnActDist = (sal_uLong) hypot( (double) nDistX, nDistY ); const PointerStyle eActStyle = ImplGetMousePointer( nDistX, nDistY ); - const sal_uInt16 nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; - const bool bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0; - const bool bVert = ( nFlags & AUTOSCROLL_VERT ) != 0; + const StartAutoScrollFlags nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags; + const bool bHorz( nFlags & StartAutoScrollFlags::Horz ); + const bool bVert( nFlags & StartAutoScrollFlags::Vert ); const bool bOuter = mnActDist > WHEEL_RADIUS; if( bOuter && ( maLastMousePos != aMousePos ) ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 7b2974ebcdad..a177383fa782 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -443,7 +443,7 @@ bool Window::IsTracking() const return (ImplGetSVData()->maWinData.mpTrackWin == this); } -void Window::StartAutoScroll( sal_uInt16 nFlags ) +void Window::StartAutoScroll( StartAutoScrollFlags nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -465,7 +465,7 @@ void Window::EndAutoScroll() if ( pSVData->maWinData.mpAutoScrollWin.get() == this ) { pSVData->maWinData.mpAutoScrollWin = NULL; - pSVData->maWinData.mnAutoScrollFlags = 0; + pSVData->maWinData.mnAutoScrollFlags = StartAutoScrollFlags::NONE; pSVData->maAppData.mpWheelWindow->ImplStop(); pSVData->maAppData.mpWheelWindow->doLazyDelete(); pSVData->maAppData.mpWheelWindow = NULL; @@ -787,21 +787,21 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, { case CommandEventId::StartAutoScroll: { - sal_uInt16 nFlags = 0; + StartAutoScrollFlags nFlags = StartAutoScrollFlags::NONE; if ( pHScrl ) { if ( (pHScrl->GetVisibleSize() < pHScrl->GetRangeMax()) && pHScrl->IsEnabled() && pHScrl->IsInputEnabled() && ! pHScrl->IsInModalMode() ) - nFlags |= AUTOSCROLL_HORZ; + nFlags |= StartAutoScrollFlags::Horz; } if ( pVScrl ) { if ( (pVScrl->GetVisibleSize() < pVScrl->GetRangeMax()) && pVScrl->IsEnabled() && pVScrl->IsInputEnabled() && ! pVScrl->IsInModalMode() ) - nFlags |= AUTOSCROLL_VERT; + nFlags |= StartAutoScrollFlags::Vert; } - if ( nFlags ) + if ( nFlags != StartAutoScrollFlags::NONE ) { StartAutoScroll( nFlags ); bRet = true; |