diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-30 19:39:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-01 08:11:22 +0000 |
| commit | b9532822b5958f71bbf2b968727731d8d221c0ee (patch) | |
| tree | 90a09bca430df2d6a057cf7d71f919b7c524902c | |
| parent | aa644ef77126426748312f5cc46cffce0e9a09d9 (diff) | |
mpNextBackWin is always null now
Change-Id: Idd789433606da3452b9cb0a702abdf549fb1c8d4
| -rw-r--r-- | vcl/inc/window.h | 1 | ||||
| -rw-r--r-- | vcl/source/window/clipping.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 1860655575ae..6911d0b8aba3 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -105,7 +105,6 @@ struct ImplWinData struct ImplOverlapData { vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated - VclPtr<vcl::Window> mpNextBackWin; //< next window with saved background }; struct ImplFrameData diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index 565bfeee78f0..ee318e152f9a 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -810,12 +810,8 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, void Window::ImplInvalidateAllOverlapBackgrounds() { vcl::Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin; - while ( pWindow ) + if (pWindow) { - // remember next window here already, as this window could - // be removed within the next if clause from the list - vcl::Window* pNext = pWindow->mpWindowImpl->mpOverlapData->mpNextBackWin; - if ( ImplIsWindowInFront( pWindow ) ) { Rectangle aRect1( Point( mnOutOffX, mnOutOffY ), @@ -831,8 +827,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds() } } - - pWindow = pNext; } } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 0e0876578862..856111e023aa 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -935,7 +935,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p { mpWindowImpl->mpOverlapData = new ImplOverlapData; mpWindowImpl->mpOverlapData->mpSaveBackRgn = nullptr; - mpWindowImpl->mpOverlapData->mpNextBackWin = nullptr; } if( pParent && ! mpWindowImpl->mbFrame ) |