INTEGRATION: CWS vclcleanup02 (1.11.8); FILE MERGED

2003/12/17 16:04:34 mt 1.11.8.5: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings
2003/12/16 18:15:19 mt 1.11.8.4: #i23061# And more cleanups...
2003/12/10 15:59:23 mt 1.11.8.3: #i23061# VCL cleanup, removed headers, methods and types...
2003/12/05 16:42:39 mt 1.11.8.2: RESYNC: (1.11-1.12); FILE MERGED
2003/12/05 13:22:28 mt 1.11.8.1: #i23061# Code cleanups, fixed gcc WAll warnings

1 files changed, 2 insertions, 38 deletions

diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index f8de4ff7dc31..1373c395e43b 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impimage.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: rt $ $Date: 2003-12-01 13:18:57 $
+ *  last change: $Author: vg $ $Date: 2004-01-06 13:43:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,6 @@
  *
  ************************************************************************/
 
-#define _SV_IMPIMAGE_CXX
-
 #include <string.h>
 
 #ifndef _SV_OUTDEV_HXX
@@ -85,17 +83,6 @@
 #include <image.hxx>
 #endif
 
-// -------------
-// - FASTIMAGE -
-// -------------
-
-#if defined WIN || defined WNT || defined OS2
-#undef FASTTRANSPARENT
-extern BOOL bFastTransparent;
-#else
-#undef FASTTRANSPARENT
-#endif
-
 // -----------
 // - Defines -
 // -----------
@@ -170,10 +157,6 @@ void ImplImageBmp::Create( const Bitmap& rBmp, const Bitmap& rMaskBmp,
     else if( bColor )
         aMask = aBmp.CreateMask( rColor );
 
-#ifdef FASTTRANSPARENT
-    if( nStyle & IMPSYSIMAGEITEM_MASK )
-        ImplUpdatePaintBmp( DISA_ALL );
-#endif
 }
 
 // -----------------------------------------------------------------------
@@ -275,10 +258,6 @@ void ImplImageBmp::Replace( USHORT nPos, const Bitmap& rBmp, const Bitmap& rMask
         ImplUpdateDisaBmp( nPos );
 
     pInfoAry[ nPos ] |= IMPSYSIMAGEITEM_MASK;
-
-#ifdef FASTTRANSPARENT
-    ImplUpdatePaintBmp( nPos );
-#endif
 }
 
 // -----------------------------------------------------------------------
@@ -324,8 +303,6 @@ void ImplImageBmp::Merge( USHORT nPos, USHORT nSrcPos )
             long                nDstRight = aDstRect.Right();
             long                nDstBottom = aDstRect.Bottom();
             long                nSrcLeft = aSrcRect.Left();
-            long                nSrcRight = aSrcRect.Right();
-            long                nSrcTop = aSrcRect.Bottom();
 
             for( long nDstY = aDstRect.Top(), nSrcY = aSrcRect.Top(); nDstY <= nDstBottom; nDstY++, nSrcY++ )
             {
@@ -355,10 +332,6 @@ void ImplImageBmp::Merge( USHORT nPos, USHORT nSrcPos )
             ImplUpdateDisaBmp( nPos );
 
         pInfoAry[ nPos ] |= IMPSYSIMAGEITEM_MASK;
-
-#ifdef FASTTRANSPARENT
-        ImplUpdatePaintBmp( nPos );
-#endif
     }
 }
 
@@ -441,11 +414,6 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev,
 
         if( pInfoAry[ nPos ] & IMPSYSIMAGEITEM_MASK )
         {
-#ifdef FASTTRANSPARENT
-            BOOL bTmp = bFastTransparent;
-            bFastTransparent = TRUE;
-#endif
-
             Point   aOutPos = pOutDev->LogicToPixel( rPos );
             Size    aOutSize;
             BOOL    bOldMap = pOutDev->IsMapModeEnabled();
@@ -600,10 +568,6 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev,
             }
 
             pOutDev->EnableMapMode( bOldMap );
-
-#ifdef FASTTRANSPARENT
-            bFastTransparent = bTmp;
-#endif
         }
         else
         {