From 79599e16bcf1dfa4e5e596981d967bce4cb8de48 Mon Sep 17 00:00:00 2001 From: fforay Date: Tue, 28 Mar 2023 11:59:33 +0200 Subject: [PATCH] (PaintLib)Correction on Color (Zip) Correction on REF param --- FabTools/FabPaintLib_Control/VOControl.prg | 15 ++++++--------- FabTools/FabZip/FabZipFile.prg | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/FabTools/FabPaintLib_Control/VOControl.prg b/FabTools/FabPaintLib_Control/VOControl.prg index 69c83d0..44fb4c2 100644 --- a/FabTools/FabPaintLib_Control/VOControl.prg +++ b/FabTools/FabPaintLib_Control/VOControl.prg @@ -226,26 +226,23 @@ BEGIN NAMESPACE FabPaintLib.Control return - access BackgroundColor as Color - local oColor as Color + access BackgroundColor as VO.Color + local oColor as VO.Color local RGB IS _WinRGBQUAD // oColor := NULL_OBJECT if self:oImg:GetBackgroundColor( @RGB ) // - oColor := Color{ RGB:rgbRed, RGB:rgbGreen, RGB:rgbBlue } + oColor := VO.Color{ RGB:rgbRed, RGB:rgbGreen, RGB:rgbBlue } endif return oColor - Assign BackgroundColor( oColor as Color ) - local RGB IS _WinRGBQUAD + Assign BackgroundColor( oColor as VO.Color ) // - RGB:rgbGreen := oColor:Green - RGB:rgbRed := oColor:Red - RGB:rgbBlue := oColor:Blue + var winColor := System.Drawing.Color.FromARGB( oColor:Red, oColor:Green, oColor:Blue ) // - self:oImg:SetBackgroundColor( oColor ) + self:oImg:SetBackgroundColor( winColor ) METHOD Destroy() CLIPPER diff --git a/FabTools/FabZip/FabZipFile.prg b/FabTools/FabZip/FabZipFile.prg index 548bda7..80c97ec 100644 --- a/FabTools/FabZip/FabZipFile.prg +++ b/FabTools/FabZip/FabZipFile.prg @@ -321,9 +321,9 @@ BEGIN NAMESPACE FabZip ENDIF NewName := "" IF Empty( SELF:cTempDir ) - FabGetTempFile( NewName, "zip" ) + FabGetTempFile( Ref NewName, "zip" ) ELSE - FabGetTempFile( NewName, "zip", SELF:cTempDir ) + FabGetTempFile( Ref NewName, "zip", SELF:cTempDir ) ENDIF // The temporary Zip FileName TmpZipName := NewName