diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-30 19:46:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-01 08:11:23 +0000 |
| commit | 7ecb1c6d8e5542dc853e42e7e3f55c62d829dab1 (patch) | |
| tree | 1260df98419ef9101ec85741a5833812aa70b21a | |
| parent | 11f1fe95f9b844cb71e02d237d8034b9ed8244f3 (diff) | |
ImplOverlapData is no longer used
Change-Id: I8fac0daefbafc9fe9e4d6cd385f543e14ac15f8a
| -rw-r--r-- | vcl/inc/window.h | 6 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 11 |
2 files changed, 0 insertions, 17 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 80d1d80c2698..5203564f5ed2 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -102,11 +102,6 @@ struct ImplWinData maTopWindowChildren; }; -struct ImplOverlapData -{ - vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated -}; - struct ImplFrameData { Idle maPaintIdle; //< paint idle handler @@ -188,7 +183,6 @@ public: ~WindowImpl(); ImplWinData* mpWinData; - ImplOverlapData* mpOverlapData; ImplFrameData* mpFrameData; SalFrame* mpFrame; SalObject* mpSysObj; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index f845fc283222..3489e0d1413d 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -550,9 +550,6 @@ void Window::dispose() delete mpWindowImpl->mpWinData; } - // cleanup overlap related window data - delete mpWindowImpl->mpOverlapData; - // remove BorderWindow or Frame window data mpWindowImpl->mpBorderWindow.disposeAndClear(); if ( mpWindowImpl->mbFrame ) @@ -612,7 +609,6 @@ WindowImpl::WindowImpl( WindowType nType ) maWinRegion = vcl::Region(true); maWinClipRegion = vcl::Region(true); mpWinData = nullptr; // Extra Window Data, that we don't need for all windows - mpOverlapData = nullptr; // Overlap Data mpFrameData = nullptr; // Frame Data mpFrame = nullptr; // Pointer to frame window mpSysObj = nullptr; @@ -930,13 +926,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p ImplInsertWindow( pParent ); mpWindowImpl->mnStyle = nStyle; - // Overlap-Window-Data - if ( mpWindowImpl->mbOverlapWin ) - { - mpWindowImpl->mpOverlapData = new ImplOverlapData; - mpWindowImpl->mpOverlapData->mpSaveBackRgn = nullptr; - } - if( pParent && ! mpWindowImpl->mbFrame ) mbEnableRTL = AllSettings::GetLayoutRTL(); |