From b48cfdc92ec7b6e5a22d0d3b6827d74478097323 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Tue, 5 Dec 2000 03:44:14 +0000 Subject: [PATCH] 2000-12-04 19:40 UTC+0800 Ron Pinkas * source/rtl/tget.prg ! Corrected 2 bugs when New Method called without any parameters. --- harbour/ChangeLog | 6 +++++- harbour/source/rtl/tget.prg | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fc831715f7..b4b971c3e1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-12-04 19:40 UTC+0800 Ron Pinkas + * source/rtl/tget.prg + ! Corrected 2 bugs when New Method called without any parameters. + 2000-12-04 17:54 GMT+1 Maurilio Longo * source/rtl/tbrowse.prg * I've rewritten from scratch stabilization and movement keys handling. @@ -12,7 +16,7 @@ 2000-12-03 15:05 UTC+0800 Ron Pinkas * source/compiler/harbour.sly ! Optimized __GETA() support, and changed it to be implementated identical to Clipper. - /* Clipper passed a bGet Block which refrences the Base Array Variable and not the Variable itself. + /* Clipper passes a bGet Block which refrences the Base Array Variable and not the Variable itself. Clipper passes NIL instead of bGet block if the Base Array is MACROVAR or MACROTEXT. Clipper does not optimize "&Macro" to Macro, but Harbour does! */ diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index 72f89a495a..02590b2e71 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -143,7 +143,7 @@ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get DEFAULT nRow TO Row() DEFAULT nCol TO Col() DEFAULT cVarName TO "" - DEFAULT bVarBlock TO MemvarBlock( cVarName ) + DEFAULT bVarBlock TO IIF( ValType( cVarName ) == 'C', MemvarBlock( cVarName ), NIL ) DEFAULT cPicture TO "" DEFAULT cColorSpec TO hb_ColorIndex( SetColor(), CLR_UNSELECTED ) + "," + hb_ColorIndex( SetColor(), CLR_ENHANCED ) @@ -421,7 +421,7 @@ return xValue METHOD VarGet() CLASS Get -return Eval( ::block ) +return IIF( ValType( ::Block ) == 'B', Eval( ::Block ), NIL ) //---------------------------------------------------------------------------//