#100860# minor updates for window based UI-mirroring

3 files changed, 21 insertions, 21 deletions

diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 89f0deb9be22..949bc5f3ce9f 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.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: ssa $ $Date: 2002-08-29 15:42:35 $
+ *  last change: $Author: ssa $ $Date: 2002-08-29 16:35:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1040,7 +1040,7 @@ void SalGraphics::DrawPolyLine( ULONG nPoints, const SalPoint *pPtAry, const Out
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void SalGraphics::DrawPolygon( ULONG nPoints, const SalPoint* pPtAry, const OutputDevice* )
+void SalGraphics::DrawPolygon( ULONG nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
 {
 #ifndef _USE_PRINT_EXTENSION_
     // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
@@ -1061,10 +1061,10 @@ void SalGraphics::DrawPolygon( ULONG nPoints, const SalPoint* pPtAry, const Outp
             else if( !_IsXORMode() )
             {
                 if( 1 == nPoints  )
-                    DrawPixel( pPtAry[0].mnX, pPtAry[0].mnY );
+                    DrawPixel( pPtAry[0].mnX, pPtAry[0].mnY, pOutDev );
                 else
                     DrawLine( pPtAry[0].mnX, pPtAry[0].mnY,
-                              pPtAry[1].mnX, pPtAry[1].mnY );
+                              pPtAry[1].mnX, pPtAry[1].mnY, pOutDev );
             }
             return;
         }
@@ -1092,7 +1092,7 @@ void SalGraphics::DrawPolygon( ULONG nPoints, const SalPoint* pPtAry, const Outp
 void SalGraphics::DrawPolyPolygon( ULONG            nPoly,
                                    const ULONG     *pPoints,
                                    PCONSTSALPOINT  *pPtAry,
-                                   const OutputDevice* )
+                                   const OutputDevice *pOutDev )
 {
 #ifndef _USE_PRINT_EXTENSION_
     if (maGraphicsData.m_pPrinterGfx != NULL)
@@ -1160,7 +1160,7 @@ void SalGraphics::DrawPolyPolygon( ULONG            nPoly,
 
         if( _GetPenColor() != 0xFFFFFFFF )
             for( ULONG i = 0; i < nPoly; i++ )
-                DrawPolyLine( pPoints[i], pPtAry[i] );
+                DrawPolyLine( pPoints[i], pPtAry[i], pOutDev );
 
 #ifndef _USE_PRINT_EXTENSION_
     }
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx
index 399245184e9f..af7d1c5c1154 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.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: ssa $ $Date: 2002-08-29 15:42:36 $
+ *  last change: $Author: ssa $ $Date: 2002-08-29 16:35:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -604,7 +604,7 @@ SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 void SalGraphics::CopyBits( const SalTwoRect *pPosAry,
                                   SalGraphics      *pSrcGraphics,
-                                  const OutputDevice*, const OutputDevice*)
+                                  const OutputDevice *pOutDev, const OutputDevice *pSrcOutDev)
 {
 #ifndef _USE_PRINT_EXTENSION_
     if (maGraphicsData.m_pPrinterGfx != NULL)
@@ -686,7 +686,7 @@ void SalGraphics::CopyBits( const SalTwoRect *pPosAry,
             SalBitmap *pDDB = pSrcGraphics->GetBitmap( pPosAry->mnSrcX,
                                                        pPosAry->mnSrcY,
                                                        pPosAry->mnSrcWidth,
-                                                       pPosAry->mnSrcHeight );
+                                                       pPosAry->mnSrcHeight, pSrcOutDev );
 
             if( !pDDB )
             {
@@ -697,7 +697,7 @@ void SalGraphics::CopyBits( const SalTwoRect *pPosAry,
             SalTwoRect aPosAry( *pPosAry );
 
             aPosAry.mnSrcX = 0, aPosAry.mnSrcY = 0;
-            DrawBitmap( &aPosAry, *pDDB );
+            DrawBitmap( &aPosAry, *pDDB, pOutDev );
 
             delete pDDB;
         }
@@ -714,7 +714,7 @@ void SalGraphics::CopyBits( const SalTwoRect *pPosAry,
 void SalGraphics::CopyArea ( long nDestX,    long nDestY,
                                    long nSrcX,     long nSrcY,
                                    long nSrcWidth, long nSrcHeight,
-                                   USHORT nFlags, const OutputDevice* )
+                                   USHORT nFlags, const OutputDevice *pOutDev )
 {
 #ifndef _USE_PRINT_EXTENSION_
     if (maGraphicsData.m_pPrinterGfx != NULL)
@@ -737,7 +737,7 @@ void SalGraphics::CopyArea ( long nDestX,    long nDestY,
         aPosAry.mnSrcWidth  = nSrcWidth;
         aPosAry.mnSrcHeight = nSrcHeight;
 
-        CopyBits ( &aPosAry, 0 );
+        CopyBits ( &aPosAry, 0, pOutDev, pOutDev );
 
 #ifndef _USE_PRINT_EXTENSION_
     }
@@ -797,7 +797,7 @@ void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBi
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,
-                                    const SalBitmap& rTransBitmap, const OutputDevice* )
+                                    const SalBitmap& rTransBitmap, const OutputDevice *pOutDev )
 {
 #ifndef _USE_PRINT_EXTENSION_
     if (maGraphicsData.m_pPrinterGfx != NULL)
@@ -887,7 +887,7 @@ void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBi
             XFlush( pXDisp );
         }
         else
-            DrawBitmap( pPosAry, rSalBitmap );
+            DrawBitmap( pPosAry, rSalBitmap, pOutDev );
 
         if( aFG )
             XFreePixmap( pXDisp, aFG );
@@ -922,7 +922,7 @@ void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBi
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 void SalGraphics::DrawMask( const SalTwoRect* pPosAry, const SalBitmap &rSalBitmap,
-                                  SalColor nMaskColor, const OutputDevice* )
+                                  SalColor nMaskColor, const OutputDevice *pOutDev )
 {
 #ifndef _USE_PRINT_EXTENSION_
     if (maGraphicsData.m_pPrinterGfx != NULL)
@@ -972,7 +972,7 @@ void SalGraphics::DrawMask( const SalTwoRect* pPosAry, const SalBitmap &rSalBitm
             XFlush( pXDisp );
         }
         else
-            DrawBitmap( pPosAry, rSalBitmap );
+            DrawBitmap( pPosAry, rSalBitmap, pOutDev );
 
 #ifndef _USE_PRINT_EXTENSION_
     }
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 21b93e10ee1b..e1ade8cdb90c 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salgdi3.cxx,v $
  *
- *  $Revision: 1.88 $
+ *  $Revision: 1.89 $
  *
- *  last change: $Author: ssa $ $Date: 2002-08-29 15:42:38 $
+ *  last change: $Author: ssa $ $Date: 2002-08-29 16:35:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2435,7 +2435,7 @@ SalLayout* SalGraphicsData::LayoutText( const ImplLayoutArgs& rArgs )
 //--------------------------------------------------------------------------
 
 #ifdef ENABLE_CTL
-SalLayout* SalGraphics::LayoutText( const ImplLayoutArgs& rArgs )
+SalLayout* SalGraphics::LayoutText( const ImplLayoutArgs& rArgs, const OutputDevice* )
 {
     SalLayout* pSalLayout = maGraphicsData.LayoutText( rArgs );
     return pSalLayout;