diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:27:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:27:10 +0000 |
| commit | 92bd23d053963320bd3f457d13a3397515fa85ec (patch) | |
| tree | 530b30dca2f327b301c208d69d25ae6cd9f0d956 | |
| parent | 7b6a9445d39825d7cb561761c95e4059c861e17a (diff) | |
INTEGRATION: CWS geordi2q14 (1.20.26); FILE MERGED
2004/01/28 16:38:22 hr 1.20.26.1: #111934#: merge CWS vcl7pp1r3
| -rw-r--r-- | vcl/unx/source/gdi/salgdi2.cxx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx index 03e84ba986b9..f653e9f32410 100644 --- a/vcl/unx/source/gdi/salgdi2.cxx +++ b/vcl/unx/source/gdi/salgdi2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi2.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: vg $ $Date: 2004-01-06 14:38:36 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:27:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,9 @@ #ifndef _SV_SALGDI_H #include <salgdi.h> #endif - +#ifndef _SV_SALFRAME_HXX +#include <salframe.hxx> +#endif #ifndef _USE_PRINT_EXTENSION_ #include <psprint/printergfx.hxx> @@ -682,6 +684,11 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry, pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight, pPosAry->mnDestX, pPosAry->mnDestY ); + + if( _IsWindow() && ! _IsVirtualDevice() ) + { + static_cast<X11SalFrame*>(m_pFrame)->YieldGraphicsExpose(); + } } else if( n ) { @@ -777,14 +784,18 @@ void X11SalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSa XGCValues aOldVal, aNewVal; int nValues = GCForeground | GCBackground; - // set foreground/background values for 1Bit bitmaps - XGetGCValues( pXDisp, aGC, nValues, &aOldVal ); - aNewVal.foreground = rColMap.GetWhitePixel(), aNewVal.background = rColMap.GetBlackPixel(); - XChangeGC( pXDisp, aGC, nValues, &aNewVal ); + if( rSalBitmap.GetBitCount() == 1 ) + { + // set foreground/background values for 1Bit bitmaps + XGetGCValues( pXDisp, aGC, nValues, &aOldVal ); + aNewVal.foreground = rColMap.GetWhitePixel(), aNewVal.background = rColMap.GetBlackPixel(); + XChangeGC( pXDisp, aGC, nValues, &aNewVal ); + } static_cast<const X11SalBitmap&>(rSalBitmap).ImplDraw( aDrawable, nDepth, *pPosAry, aGC ); - XChangeGC( pXDisp, aGC, nValues, &aOldVal ); + if( rSalBitmap.GetBitCount() == 1 ) + XChangeGC( pXDisp, aGC, nValues, &aOldVal ); XFlush( pXDisp ); #ifndef _USE_PRINT_EXTENSION_ |