From dd4607f1c9ac32fdeed3e055b21e1a876ce4f331 Mon Sep 17 00:00:00 2001 From: macpgmr Date: Fri, 27 Jul 2012 21:15:43 +0000 Subject: [PATCH] Changes so Orpheus package can be compiled with current Laz 0.9.31. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2483 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/orpheus/mymisc.pas | 2 +- components/orpheus/ovclabel.pas | 8 ++++---- components/orpheus/ovctcbmp.pas | 8 ++++---- components/orpheus/ovctccbx.pas | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/components/orpheus/mymisc.pas b/components/orpheus/mymisc.pas index c28126ec4..ef1e67eac 100644 --- a/components/orpheus/mymisc.pas +++ b/components/orpheus/mymisc.pas @@ -319,7 +319,7 @@ procedure RecreateWnd(const AWinControl:TWinControl); procedure Frame3D(Canvas: TCanvas; var Rect: TRect; TopColor, BottomColor: TColor; Width: Integer); - {This should be a TCanvas method} +// {This should be a TCanvas method} <--it is now, but still needed for TBitMap.BrushCopy. procedure BrushCopy(DestCanvas: TCanvas; const Dest: TRect; Bitmap: TBitmap; const Source: TRect; Color: TColor); diff --git a/components/orpheus/ovclabel.pas b/components/orpheus/ovclabel.pas index a58753c9d..702fcf20c 100644 --- a/components/orpheus/ovclabel.pas +++ b/components/orpheus/ovclabel.pas @@ -680,11 +680,11 @@ begin RctTemp := Rect(0, IV + Round(I*Step), CR.Right-CR.Left, IV + Round((I+1)*Step)) else RctTemp := Rect(IU + Round(I*Step), 0, IU + Round((I+1)*Step), CR.Bottom-CR.Top); -{$IFNDEF LCL} +//{$IFNDEF LCL} BmpWork.Canvas.BrushCopy(RctTemp, BmpTemp, RctTemp, BmpTemp.Canvas.Font.Color); -{$ELSE} - BrushCopy(BmpWork.Canvas, RctTemp, BmpTemp, RctTemp, BmpTemp.Canvas.Font.Color); -{$ENDIF} +//{$ELSE} +// BrushCopy(BmpWork.Canvas, RctTemp, BmpTemp, RctTemp, BmpTemp.Canvas.Font.Color); +//{$ENDIF} end; end; diff --git a/components/orpheus/ovctcbmp.pas b/components/orpheus/ovctcbmp.pas index 7cd961db7..24a858940 100644 --- a/components/orpheus/ovctcbmp.pas +++ b/components/orpheus/ovctcbmp.pas @@ -185,11 +185,11 @@ procedure TOvcTCBaseBitMap.tcPaint(TableCanvas : TCanvas; Bottom := Top + DisplayHt; end; {brush copy the bitmap onto the table} -{$IFNDEF LCL} - TableCanvas.BrushCopy(DestRect, BMInfo^.BM, SrcRect, TransparentColor); -{$ELSE} +//{$IFNDEF LCL} +// TableCanvas.BrushCopy(DestRect, BMInfo^.BM, SrcRect, TransparentColor); +//{$ELSE} BrushCopy(TableCanvas, DestRect, BMInfo^.BM, SrcRect, TransparentColor); -{$ENDIF} +//{$ENDIF} end; function TOvcTCBaseBitMap.EditHandle : THandle; diff --git a/components/orpheus/ovctccbx.pas b/components/orpheus/ovctccbx.pas index 2e7be6995..b16826941 100644 --- a/components/orpheus/ovctccbx.pas +++ b/components/orpheus/ovctccbx.pas @@ -615,11 +615,11 @@ procedure TOvcTCCustomComboBox.DrawButton(Canvas : TCanvas; Right := Left + Wd; Bottom := Top + Ht; end; -{$IFNDEF LCL} +//{$IFNDEF LCL} BrushCopy(DestRect, OvcComboBoxBitmap, SrcRect, clSilver); -{$ELSE} - BrushCopy(Canvas, DestRect, OvcComboBoxBitmap, SrcRect, clSilver); -{$ENDIF} +//{$ELSE} +// BrushCopy(Canvas, DestRect, OvcComboBoxBitmap, SrcRect, clSilver); +//{$ENDIF} end; end; {--------}