Kaydet (Commit) 7ecb1c6d authored tarafından Caolán McNamara's avatar Caolán McNamara

ImplOverlapData is no longer used

Change-Id: I8fac0daefbafc9fe9e4d6cd385f543e14ac15f8a
üst 11f1fe95
...@@ -102,11 +102,6 @@ struct ImplWinData ...@@ -102,11 +102,6 @@ struct ImplWinData
maTopWindowChildren; maTopWindowChildren;
}; };
struct ImplOverlapData
{
vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated
};
struct ImplFrameData struct ImplFrameData
{ {
Idle maPaintIdle; //< paint idle handler Idle maPaintIdle; //< paint idle handler
...@@ -188,7 +183,6 @@ public: ...@@ -188,7 +183,6 @@ public:
~WindowImpl(); ~WindowImpl();
ImplWinData* mpWinData; ImplWinData* mpWinData;
ImplOverlapData* mpOverlapData;
ImplFrameData* mpFrameData; ImplFrameData* mpFrameData;
SalFrame* mpFrame; SalFrame* mpFrame;
SalObject* mpSysObj; SalObject* mpSysObj;
......
...@@ -550,9 +550,6 @@ void Window::dispose() ...@@ -550,9 +550,6 @@ void Window::dispose()
delete mpWindowImpl->mpWinData; delete mpWindowImpl->mpWinData;
} }
// cleanup overlap related window data
delete mpWindowImpl->mpOverlapData;
// remove BorderWindow or Frame window data // remove BorderWindow or Frame window data
mpWindowImpl->mpBorderWindow.disposeAndClear(); mpWindowImpl->mpBorderWindow.disposeAndClear();
if ( mpWindowImpl->mbFrame ) if ( mpWindowImpl->mbFrame )
...@@ -612,7 +609,6 @@ WindowImpl::WindowImpl( WindowType nType ) ...@@ -612,7 +609,6 @@ WindowImpl::WindowImpl( WindowType nType )
maWinRegion = vcl::Region(true); maWinRegion = vcl::Region(true);
maWinClipRegion = vcl::Region(true); maWinClipRegion = vcl::Region(true);
mpWinData = nullptr; // Extra Window Data, that we don't need for all windows mpWinData = nullptr; // Extra Window Data, that we don't need for all windows
mpOverlapData = nullptr; // Overlap Data
mpFrameData = nullptr; // Frame Data mpFrameData = nullptr; // Frame Data
mpFrame = nullptr; // Pointer to frame window mpFrame = nullptr; // Pointer to frame window
mpSysObj = nullptr; mpSysObj = nullptr;
...@@ -930,13 +926,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p ...@@ -930,13 +926,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
ImplInsertWindow( pParent ); ImplInsertWindow( pParent );
mpWindowImpl->mnStyle = nStyle; mpWindowImpl->mnStyle = nStyle;
// Overlap-Window-Data
if ( mpWindowImpl->mbOverlapWin )
{
mpWindowImpl->mpOverlapData = new ImplOverlapData;
mpWindowImpl->mpOverlapData->mpSaveBackRgn = nullptr;
}
if( pParent && ! mpWindowImpl->mbFrame ) if( pParent && ! mpWindowImpl->mbFrame )
mbEnableRTL = AllSettings::GetLayoutRTL(); mbEnableRTL = AllSettings::GetLayoutRTL();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment