summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-30 19:33:39 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-01 08:11:21 +0000
commit3ce65a05a59cae95e5758bd626f911ac46428a83 (patch)
tree346d9b16fe9008bccfeb4aa7f9ac1e9880281f84 /vcl
parent90826f783bc2c6b2a93d67fc89a99d146a7886bf (diff)
nothing sets mpSaveBackDev anymore
Change-Id: I6be6a1cbcb63510469d8c419433bf05bf4fde6e5
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/window.h1
-rw-r--r--vcl/source/window/clipping.cxx55
-rw-r--r--vcl/source/window/paint.cxx4
-rw-r--r--vcl/source/window/window.cxx3
4 files changed, 0 insertions, 63 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 2b8d8481848e..1860655575ae 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -104,7 +104,6 @@ struct ImplWinData
struct ImplOverlapData
{
- VclPtr<VirtualDevice> mpSaveBackDev; //< saved background bitmap
vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated
VclPtr<vcl::Window> mpNextBackWin; //< next window with saved background
};
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index 05f8f4cb5360..89a12a03c70d 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -809,66 +809,11 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize,
bool Window::ImplRestoreOverlapBackground( vcl::Region& rInvRegion )
{
- if ( mpWindowImpl->mpOverlapData->mpSaveBackDev )
- {
- if ( mpWindowImpl->mbInitWinClipRegion )
- ImplInitWinClipRegion();
-
- if ( mpWindowImpl->mpOverlapData->mpSaveBackDev )
- {
- Point aDevPt;
- Point aDestPt( mnOutOffX, mnOutOffY );
- Size aDevSize = mpWindowImpl->mpOverlapData->mpSaveBackDev->GetOutputSizePixel();
-
- Window *pWin = mpWindowImpl->mpFrameWindow;
-
- if ( mpWindowImpl->mpOverlapData->mpSaveBackRgn )
- {
- mpWindowImpl->mpOverlapData->mpSaveBackRgn->Intersect( mpWindowImpl->maWinClipRegion );
- rInvRegion = mpWindowImpl->maWinClipRegion;
- rInvRegion.Exclude( *mpWindowImpl->mpOverlapData->mpSaveBackRgn );
- pWin->drawFrameDev( aDestPt, aDevPt, aDevSize,
- *(mpWindowImpl->mpOverlapData->mpSaveBackDev),
- *mpWindowImpl->mpOverlapData->mpSaveBackRgn );
- }
- else
- {
- pWin->drawFrameDev( aDestPt, aDevPt, aDevSize,
- *(mpWindowImpl->mpOverlapData->mpSaveBackDev),
- mpWindowImpl->maWinClipRegion );
- }
- ImplDeleteOverlapBackground();
- }
-
- return true;
- }
-
return false;
}
void Window::ImplDeleteOverlapBackground()
{
- if ( mpWindowImpl->mpOverlapData->mpSaveBackDev )
- {
- mpWindowImpl->mpOverlapData->mpSaveBackDev.disposeAndClear();
- if ( mpWindowImpl->mpOverlapData->mpSaveBackRgn )
- {
- delete mpWindowImpl->mpOverlapData->mpSaveBackRgn;
- mpWindowImpl->mpOverlapData->mpSaveBackRgn = nullptr;
- }
-
- // remove window from the list
- if ( mpWindowImpl->mpFrameData->mpFirstBackWin == this )
- mpWindowImpl->mpFrameData->mpFirstBackWin = mpWindowImpl->mpOverlapData->mpNextBackWin;
- else
- {
- vcl::Window* pTemp = mpWindowImpl->mpFrameData->mpFirstBackWin;
- while ( pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin.get() != this )
- pTemp = pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin;
- pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin = mpWindowImpl->mpOverlapData->mpNextBackWin;
- }
- mpWindowImpl->mpOverlapData->mpNextBackWin = nullptr;
- }
}
void Window::ImplInvalidateAllOverlapBackgrounds()
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 44aeb97d0bf0..483a55c798d4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1061,8 +1061,6 @@ void Window::SetWindowRegionPixel()
if ( IsReallyVisible() )
{
// restore background storage
- if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mpSaveBackDev )
- ImplDeleteOverlapBackground();
if ( mpWindowImpl->mpFrameData->mpFirstBackWin )
ImplInvalidateAllOverlapBackgrounds();
Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) );
@@ -1148,8 +1146,6 @@ void Window::SetWindowRegionPixel( const vcl::Region& rRegion )
if ( IsReallyVisible() )
{
// restore background storage
- if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mpSaveBackDev )
- ImplDeleteOverlapBackground();
if ( mpWindowImpl->mpFrameData->mpFirstBackWin )
ImplInvalidateAllOverlapBackgrounds();
Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f34c8e0eecac..b40cda26fa13 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -934,7 +934,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
if ( mpWindowImpl->mbOverlapWin )
{
mpWindowImpl->mpOverlapData = new ImplOverlapData;
- mpWindowImpl->mpOverlapData->mpSaveBackDev = nullptr;
mpWindowImpl->mpOverlapData->mpSaveBackRgn = nullptr;
mpWindowImpl->mpOverlapData->mpNextBackWin = nullptr;
}
@@ -1754,8 +1753,6 @@ void Window::ImplPosSizeWindow( long nX, long nY,
if ( bNewPos || bNewSize )
{
// reset background storage
- if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mpSaveBackDev )
- ImplDeleteOverlapBackground();
if ( mpWindowImpl->mpFrameData->mpFirstBackWin )
ImplInvalidateAllOverlapBackgrounds();
// set Clip-Flag