From dd39f3c21e8fdb565e9c5f11e60aa45b84ad7d3b Mon Sep 17 00:00:00 2001
From: Ryszard Glab <rglab@imid.med.pl>
Date: Tue, 3 Aug 2004 09:02:09 +0000
Subject: [PATCH] 2004-08-03 11:10 UTC+0100 Ryszard Glab <rglab@imid.med.pl>   
 * source/rtl/tget.prg       * GetNew() no longer evaluates passed set/get
 codeblock

---
 harbour/ChangeLog           |  5 +++++
 harbour/source/rtl/tget.prg | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cde59f4b09..06ed78a6a9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-08-03 11:10 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
+   * source/rtl/tget.prg
+      * GetNew() no longer evaluates passed set/get codeblock
+      
+
 2004-08-01 14:38 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
 
    * source/rtl/filesys.c
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index c7201b912f..92bb40f044 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -186,7 +186,8 @@ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get
    ::HasFocus   := .f.
    ::lEdit      := .f.
    ::BadDate    := .f.
-   ::Block      := bVarBlock
+   ::bBlock     := bVarBlock
+//   ::Block      := bVarBlock
    ::Changed    := .f.
    ::Clear      := .f.
    ::Col        := nCol
@@ -203,7 +204,7 @@ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get
    ::Rejected   := .f.
    ::Row        := nRow
    ::SubScript  := NIL
-   ::Type       := ValType( ::Original )
+//   ::Type       := ValType( ::Original )
    ::TypeOut    := .f.
    ::nDispPos   := 1
    ::nOldPos    := 0
@@ -284,6 +285,11 @@ METHOD ParsePict( cPicture ) CLASS Get
       ::lCleanZero := .f.
    endif
 
+   if( ::type == nil )
+      ::Original := ::VarGet()
+      ::Type     := ValType( ::Original )
+   endif
+
    if ::type == "D"
       ::cPicMask := LTrim( ::cPicMask )
    endif
@@ -370,6 +376,8 @@ METHOD Display( lForced ) CLASS Get
    DEFAULT lForced TO .t.
 
    if ::buffer == nil
+      ::Original := ::VarGet()
+      ::Type     := ValType( ::Original )
       ::picture := ::cPicture    //this sets also ::buffer
    endif
 
@@ -1198,9 +1206,12 @@ METHOD PutMask( xValue, lEdit ) CLASS Get
    local nAt
    local nNoEditable := 0
 
+
    if ::Type == NIL
-      ::Type := ValType( ::VarGet() )
-      ::Picture := ::cPicture
+      //not initialized yet
+      ::Original := ::VarGet()
+      ::Type     := ValType( ::Original )
+      ::Picture  := ::cPicture
    endif
 
    cPicFunc := ::cPicFunc