diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-07-25 13:23:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-07-25 13:23:19 +0000 |
| commit | f0f92e0c94a94d67c7be771fb47a0497c90264ac (patch) | |
| tree | c6da16f5b95ced364f04a28e33d6bc85eedf7528 /vcl | |
| parent | d41c397e7a8df19bf276c092c87bb10152a1b57b (diff) | |
INTEGRATION: CWS vclshowstop05 (1.34.260); FILE MERGED
2005/07/22 14:11:44 pl 1.34.260.1: #i52333# handle transparent pen
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/gdi/salgdi.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx index 82030304c2fc..42ea7f384640 100644 --- a/vcl/unx/source/gdi/salgdi.cxx +++ b/vcl/unx/source/gdi/salgdi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2004-11-16 15:17:05 $ + * last change: $Author: hr $ $Date: 2005-07-25 14:23:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -272,12 +272,9 @@ GC X11SalGraphics::SelectPen() { Display *pDisplay = GetXDisplay(); - DBG_ASSERT( nPenColor_ != 0xFFFFFFFF, "Pen Transparent" ); - if( !pPenGC_ ) { XGCValues values; - //values.subwindow_mode = IncludeInferiors; values.subwindow_mode = ClipByChildren; values.fill_rule = EvenOddRule; // Pict import/ Gradient values.graphics_exposures = True; @@ -289,7 +286,8 @@ GC X11SalGraphics::SelectPen() if( !bPenGC_ ) { - XSetForeground( pDisplay, pPenGC_, nPenPixel_ ); + if( nPenColor_ != 0xFFFFFFFF ) + XSetForeground( pDisplay, pPenGC_, nPenPixel_ ); XSetFunction ( pDisplay, pPenGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pPenGC_ ); bPenGC_ = TRUE; |