diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 12:54:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-11 07:54:40 +0000 |
| commit | 10cc455580b2349e99ac48732cc451f7e2126953 (patch) | |
| tree | 40c7225a054740cdf4462116b46d9fd3e960d482 /vcl/source/window | |
| parent | 4e8a0a75f46356639ac9e00086e2ec9b9f333c77 (diff) | |
convert SAL_FRAME_TOTOP to scoped enum
Change-Id: Id996e1e6fc29f6323bd4e82785386de26d075cae
Reviewed-on: https://gerrit.libreoffice.org/24834
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/mouse.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/stacking.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 4782c15aa5ac..516b6ed7e9fc 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -305,7 +305,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags ) { // here we already switch focus as ToTop() // should not give focus to another window - mpWindowImpl->mpFrame->ToTop( SAL_FRAME_TOTOP_GRABFOCUS | SAL_FRAME_TOTOP_GRABFOCUS_ONLY ); + mpWindowImpl->mpFrame->ToTop( SalFrameToTop::GrabFocus | SalFrameToTop::GrabFocusOnly ); return; } } diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 8418919b8b67..cb51c6d03e31 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -252,13 +252,13 @@ void Window::ImplToTop( ToTopFlags nFlags ) // do not bring floating windows on the client to top if( !ImplGetClientWindow() || !(ImplGetClientWindow()->GetStyle() & WB_SYSTEMFLOATWIN) ) { - sal_uInt16 nSysFlags = 0; + SalFrameToTop nSysFlags = SalFrameToTop::NONE; if ( nFlags & ToTopFlags::RestoreWhenMin ) - nSysFlags |= SAL_FRAME_TOTOP_RESTOREWHENMIN; + nSysFlags |= SalFrameToTop::RestoreWhenMin; if ( nFlags & ToTopFlags::ForegroundTask ) - nSysFlags |= SAL_FRAME_TOTOP_FOREGROUNDTASK; + nSysFlags |= SalFrameToTop::ForegroundTask; if ( nFlags & ToTopFlags::GrabFocusOnly ) - nSysFlags |= SAL_FRAME_TOTOP_GRABFOCUS_ONLY; + nSysFlags |= SalFrameToTop::GrabFocusOnly; mpWindowImpl->mpFrame->ToTop( nSysFlags ); } } @@ -985,7 +985,7 @@ void Window::SetParent( vcl::Window* pNewParent ) mpWindowImpl->mpFrameData->mpFocusWin = Application::GetFocusWindow(); if ( !mpWindowImpl->mpFrameData->mbHasFocus ) { - mpWindowImpl->mpFrame->ToTop( 0 ); + mpWindowImpl->mpFrame->ToTop( SalFrameToTop::NONE ); } } |