diff --git a/components/virtualtreeview-unstable/VirtualTrees.pas b/components/virtualtreeview-unstable/VirtualTrees.pas index 2d1b46ebd..e6006e5ea 100644 --- a/components/virtualtreeview-unstable/VirtualTrees.pas +++ b/components/virtualtreeview-unstable/VirtualTrees.pas @@ -118,7 +118,9 @@ interface {$endif} uses - {$i intf_uses.inc} + {$ifdef LCLWin32} + Windows, + {$endif} ActiveX, OleUtils, DelphiCompat, @@ -8952,8 +8954,8 @@ begin if not (hpeSortGlyph in ActualElements) and ShowSortGlyph then begin SortIndex := SortGlyphs[FHeader.FSortDirection, tsUseThemes in FHeader.Treeview.FStates]; - StretchMaskBlt(FHeaderBitmap.Canvas.Handle, SortGlyphPos.X, SortGlyphPos.Y, UtilityImageSize, UtilityImageSize, UtilityImages.Canvas.Handle, - SortIndex * UtilityImageSize, 0, UtilityImageSize, UtilityImageSize, UtilityImages.MaskHandle, 0, 0, 0); + DirectMaskBlt(FHeaderBitmap.Canvas.Handle, SortGlyphPos.X, SortGlyphPos.Y, UtilityImageSize, UtilityImageSize, UtilityImages.Canvas.Handle, + SortIndex * UtilityImageSize, 0, UtilityImages.MaskHandle); //UtilityImages.Draw(FHeaderBitmap.Canvas, SortGlyphPos.X, SortGlyphPos.X, SortIndex); end; @@ -8963,12 +8965,12 @@ begin Y := (PaintRectangle.Top + PaintRectangle.Bottom - UtilityImages.Height) div 2; if DropMark = dmmLeft then - StretchMaskBlt(FHeaderBitmap.Canvas.Handle, PaintRectangle.Left, Y, UtilityImageSize, UtilityImageSize, UtilityImages.Canvas.Handle, - 0 * UtilityImageSize, 0, UtilityImageSize, UtilityImageSize, UtilityImages.MaskHandle, 0, 0, 0) + DirectMaskBlt(FHeaderBitmap.Canvas.Handle, PaintRectangle.Left, Y, UtilityImageSize, UtilityImageSize, UtilityImages.Canvas.Handle, + 0 * UtilityImageSize, 0, UtilityImages.MaskHandle) //UtilityImages.Draw(FHeaderBitmap.Canvas, PaintRectangle.Left, Y, 0) else - StretchMaskBlt(FHeaderBitmap.Canvas.Handle, PaintRectangle.Right - 16, Y, UtilityImageSize, UtilityImageSize, UtilityImages.Canvas.Handle, - 1 * UtilityImageSize, 0, UtilityImageSize, UtilityImageSize, UtilityImages.MaskHandle, 0, 0, 0); + DirectMaskBlt(FHeaderBitmap.Canvas.Handle, PaintRectangle.Right - 16, Y, UtilityImageSize, UtilityImageSize, UtilityImages.Canvas.Handle, + 1 * UtilityImageSize, 0, UtilityImages.MaskHandle); //UtilityImages.Draw(FHeaderBitmap.Canvas, PaintRectangle.Right - 16 , Y, 1); end; @@ -21514,9 +21516,6 @@ end; //---------------------------------------------------------------------------------------------------------------------- -type - TCustomImageListCast = class(TCustomImageList); - procedure TBaseVirtualTree.PaintImage(var PaintInfo: TVTPaintInfo; ImageInfoIndex: TVTImageInfoIndex; DoOverlay: Boolean); const diff --git a/components/virtualtreeview-unstable/demos/images/images.lpi b/components/virtualtreeview-unstable/demos/images/images.lpi index d33ffa3c9..db385d224 100644 --- a/components/virtualtreeview-unstable/demos/images/images.lpi +++ b/components/virtualtreeview-unstable/demos/images/images.lpi @@ -2,7 +2,7 @@ - +