diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-24 17:47:23 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-24 17:47:23 +0000 |
| commit | 191a03067dfdae24ac93e32e4b2f4b88b6d0814d (patch) | |
| tree | 7376e2ff34511500e9018b38af9683b1be554b5a /vcl/source | |
| parent | ab9aa0da0752cdcf98bf4312b6c36dd48ed9a336 (diff) | |
CWS-TOOLING: integrate CWS fwk110_DEV300
2009-04-03 11:16:33 +0200 pl r270467 : fix the vanishing form contro problem
2009-04-03 09:26:00 +0200 cd r270455 : #159523# Use build id to check for showing the registration dialog again
2009-04-03 09:22:55 +0200 od r270454 : #i100732# method <SwTxtFormatter::NewTabPortion(..)>
- correction of condition for applying automatic tab stop at left margin
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/window.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 48a029df8f69..676375db10bf 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2523,12 +2523,15 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, USHORT nFlags ) if ( !ImplIsOverlapWindow() ) { Window* pTempWindow = this; + USHORT nTranspPaint = IsPaintTransparent() ? IMPL_PAINT_PAINT : 0; do { pTempWindow = pTempWindow->ImplGetParent(); if ( pTempWindow->mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTCHILDS ) break; - pTempWindow->mpWindowImpl->mnPaintFlags |= IMPL_PAINT_PAINTCHILDS; + pTempWindow->mpWindowImpl->mnPaintFlags |= IMPL_PAINT_PAINTCHILDS | nTranspPaint; + if( ! pTempWindow->IsPaintTransparent() ) + nTranspPaint = 0; } while ( !pTempWindow->ImplIsOverlapWindow() ); } @@ -6508,7 +6511,10 @@ void Window::Show( BOOL bVisible, USHORT nFlags ) if ( !mpWindowImpl->mbFrame ) { - ImplInvalidate( NULL, INVALIDATE_NOTRANSPARENT | INVALIDATE_CHILDREN ); + USHORT nInvalidateFlags = INVALIDATE_CHILDREN; + if( ! IsPaintTransparent() ) + nInvalidateFlags |= INVALIDATE_NOTRANSPARENT; + ImplInvalidate( NULL, nInvalidateFlags ); ImplGenerateMouseMove(); } } |