diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-22 13:48:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-25 10:31:35 +0200 |
| commit | 65be8fd0f7f30eaca4fbc35e3fdc9cb7763cb44d (patch) | |
| tree | bbfe99aba8f0155c7365b4b9d4bcd226654d88d6 /vcl | |
| parent | b419da0f53cf7f65b1d0c58351176ece23fbfe1f (diff) | |
convert WINDOW_ZORDER constants to scoped enum
Change-Id: I91a583fe7d4195ee6bc73b4854f757517b38408b
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/btndlg.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/stacking.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index bb0f0a35f600..102f5ce839bd 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -240,7 +240,7 @@ void ButtonDialog::StateChanged( StateChangedType nType ) for (btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it) { if ( it->mpPushButton && it->mbOwnButton ) - it->mpPushButton->SetZOrder(0, WINDOW_ZORDER_LAST); + it->mpPushButton->SetZOrder(0, ZOrderFlags::Last); } // Set focus on default button. diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 3d4fabb3e60f..596f49ae00b2 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -443,7 +443,7 @@ void Window::ToTop( sal_uInt16 nFlags ) ImplFocusToTop( nFlags, IsReallyVisible() ); } -void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) +void Window::SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ) { if ( mpWindowImpl->mpBorderWindow ) @@ -452,21 +452,21 @@ void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) return; } - if ( nFlags & WINDOW_ZORDER_FIRST ) + if ( nFlags & ZOrderFlags::First ) { if ( ImplIsOverlapWindow() ) pRefWindow = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; else pRefWindow = mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild; - nFlags |= WINDOW_ZORDER_BEFOR; + nFlags |= ZOrderFlags::Before; } - else if ( nFlags & WINDOW_ZORDER_LAST ) + else if ( nFlags & ZOrderFlags::Last ) { if ( ImplIsOverlapWindow() ) pRefWindow = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpLastOverlap; else pRefWindow = mpWindowImpl->mpParent->mpWindowImpl->mpLastChild; - nFlags |= WINDOW_ZORDER_BEHIND; + nFlags |= ZOrderFlags::Behind; } while ( pRefWindow && pRefWindow->mpWindowImpl->mpBorderWindow ) @@ -475,7 +475,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) return; DBG_ASSERT( pRefWindow->mpWindowImpl->mpParent == mpWindowImpl->mpParent, "Window::SetZOrder() - pRefWindow has other parent" ); - if ( nFlags & WINDOW_ZORDER_BEFOR ) + if ( nFlags & ZOrderFlags::Before ) { if ( pRefWindow->mpWindowImpl->mpPrev.get() == this ) return; @@ -513,7 +513,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) mpWindowImpl->mpPrev->mpWindowImpl->mpNext = this; mpWindowImpl->mpNext->mpWindowImpl->mpPrev = this; } - else if ( nFlags & WINDOW_ZORDER_BEHIND ) + else if ( nFlags & ZOrderFlags::Behind ) { if ( pRefWindow->mpWindowImpl->mpNext.get() == this ) return; |