From 59069d5707bb54bc518d7a725183e3176629cbc9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 15 Feb 2000 20:24:14 +0000
Subject: [PATCH] 20000215-20:53 GMT+1 Victor Szakats <info@szelvesz.hu>

---
 harbour/doc/funclist.txt        | 10 +++----
 harbour/source/rtl/dummy.prg    |  8 ++---
 harbour/source/rtl/tgetlist.prg | 52 ++++++++++++++++++++++++---------
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/harbour/doc/funclist.txt b/harbour/doc/funclist.txt
index 08843e43c3..aa15b9fcb4 100644
--- a/harbour/doc/funclist.txt
+++ b/harbour/doc/funclist.txt
@@ -183,7 +183,7 @@ MEMVARBLOCK             ;R;
 MIN                     ;R;
 MLCOUNT                 ;R;
 MLCTOPOS                ;N;
-MLPOS                   ;N;
+MLPOS                   ;R;
 MOD                     ;R;
 MONTH                   ;R;
 MPOSTOLC                ;N;
@@ -247,7 +247,7 @@ TIME                    ;R;
 TONE                    ;S;
 TRANSFORM               ;R;
 TYPE                    ;R;
-UPDATED                 ;N;
+UPDATED                 ;R;
 UPPER                   ;R;
 USED                    ;R;
 VAL                     ;R;
@@ -310,7 +310,7 @@ __Quit                  ;R;
 __ReportForm            ;R;
 __Run                   ;R;
 __SetCentury            ;R;
-__SetFormat             ;N;
+__SetFormat             ;R;
 __SetFunction           ;R;
 __TextRestore           ;R;
 __TextSave              ;R;
@@ -320,11 +320,11 @@ __XRestScreen           ;R;
 __XSaveScreen           ;R;
 ; GET SYSTEM
 GETACTIVE               ;R;
-GETAPPLYKEY             ;N;
+GETAPPLYKEY             ;R;
 GETDOSETKEY             ;R;
 GETPOSTVALIDATE         ;R;
 GETPREVALIDATE          ;R;
-GETREADER               ;N;
+GETREADER               ;R;
 READFORMAT              ;R;
 READKILL                ;R;
 READUPDATED             ;R;
diff --git a/harbour/source/rtl/dummy.prg b/harbour/source/rtl/dummy.prg
index a1492f810c..66d00bf8ed 100644
--- a/harbour/source/rtl/dummy.prg
+++ b/harbour/source/rtl/dummy.prg
@@ -48,8 +48,6 @@ FUNCTION ordScope()        ; RETURN NIL /* 5.3 */
 FUNCTION ordSetRelation()  ; RETURN NIL /* 5.3 */
 FUNCTION ordSkipUnique()   ; RETURN .F. /* 5.3 */
 
-FUNCTION dbSetRelation()   ; RETURN NIL
-FUNCTION dbClearRelation() ; RETURN NIL
 FUNCTION dbFileGet()       ; RETURN .F. /* 5.3 */
 FUNCTION dbFilePut()       ; RETURN .F. /* 5.3 */
 FUNCTION dbInfo()          ; RETURN NIL /* 5.3 */
@@ -57,6 +55,9 @@ FUNCTION dbOrderInfo()     ; RETURN NIL /* 5.3 */
 FUNCTION dbRecordInfo()    ; RETURN NIL /* 5.3 */
 FUNCTION dbFieldInfo()     ; RETURN NIL /* 5.3 */
 
+FUNCTION dbSetRelation()   ; RETURN NIL
+FUNCTION dbClearRelation() ; RETURN NIL
+
 FUNCTION MemoEdit( str )   ; RETURN str
 FUNCTION MLCToPos()        ; RETURN 0
 FUNCTION MPosToLC()        ; RETURN 0
@@ -80,6 +81,3 @@ FUNCTION __dbTransRec()    ; RETURN NIL
 
 FUNCTION __TypeFile()      ; RETURN NIL
 
-FUNCTION GetApplyKey()     ; RETURN NIL
-FUNCTION GetReader()       ; RETURN NIL
-FUNCTION __SetFormat()     ; RETURN NIL
diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg
index 558d9edbda..ed35616dac 100644
--- a/harbour/source/rtl/tgetlist.prg
+++ b/harbour/source/rtl/tgetlist.prg
@@ -162,6 +162,12 @@ METHOD Reader() CLASS TGetList
 
 return nil
 
+procedure GetReader( oGet )
+
+   oGet:Reader()
+
+return
+
 METHOD GetApplyKey( nKey ) CLASS TGetList
 
    local cKey, bKeyBlock, oGet := ::oGet
@@ -503,12 +509,22 @@ METHOD SetFormat( bFormat ) CLASS TGetList
 
    local bSavFormat := ::bFormat
 
-   if PCount() > 0
-      ::bFormat = bFormat
-   endif
+   ::bFormat = bFormat
 
 return bSavFormat
 
+procedure __SetFormat( bFormat )
+
+   if s_oGetListActive != nil
+      if ValType( bFormat ) == "B"
+         s_oGetListActive:SetFormat( bFormat )
+      else
+         s_oGetListActive:SetFormat()
+      endif
+   endif
+
+return
+
 METHOD KillRead( lKill ) CLASS TGetList
 
    local lSavKill := ::lKillRead
@@ -523,11 +539,15 @@ function ReadKill( lKill )
 
    if PCount() > 0
       return s_oGetListActive:KillRead( lKill )
-   else
-      return s_oGetListActive:KillRead()
    endif
 
-return nil
+return s_oGetListActive:KillRead()
+
+procedure __KillRead()
+
+   s_oGetListActive:KillRead( .T. )
+
+return
 
 METHOD GetActive( oGet ) CLASS TGetList
 
@@ -650,11 +670,9 @@ FUNCTION ReadVar( cNewVarName )
 
    if s_oGetListActive != nil
       return s_oGetListActive:ReadVar( cNewVarName )
-   else
-      return ""
    endif
 
-return nil
+return ""
 
 FUNCTION ReadExit( lExit )
    RETURN Set( _SET_EXIT, lExit )
@@ -676,11 +694,9 @@ function ReadUpdated( lUpdated )
 
    if PCount() > 0
       return s_oGetListActive:ReadUpdated( lUpdated )
-   else
-      return s_oGetListActive:ReadUpdate()
    endif
 
-return nil
+return s_oGetListActive:ReadUpdated()
 
 function Updated()
 
@@ -688,4 +704,14 @@ function Updated()
       return s_oGetListActive:lUpdated
    endif
 
-return .f.
\ No newline at end of file
+return .f.
+
+function GetApplyKey( oGet, nKey )
+
+  if s_oGetListActive != nil
+     s_oGetListActive:oGet := oGet
+     s_oGetListActive:GetApplyKey( nKey )
+  endif
+
+return nil
+