From 6542f93e623f89628bb0350420cb947608f55a0e Mon Sep 17 00:00:00 2001 From: Maurilio Longo Date: Mon, 11 Dec 2000 20:51:11 +0000 Subject: [PATCH] 2000-12-11 21:45 GMT+1 Maurilio Longo * source/rtl/tbrowse.prg - removed hidden: clause inside class definition (it doesn't work right now) * source/rtl/tclass.prg - commented out line 255 (gives infinite loop) * utils/hbmake/*.prg + hbdocdef.ch needs relative path ("..\hbdoc\") to be compiled by gcc system --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/tbrowse.prg | 2 +- harbour/source/rtl/tclass.prg | 2 +- harbour/utils/hbmake/fclass1.prg | 2 +- harbour/utils/hbmake/ffile1.prg | 2 +- harbour/utils/hbmake/ft_funcs.prg | 4 ++-- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cdf4822c32..e6b35e2fff 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +2000-12-11 21:45 GMT+1 Maurilio Longo + * source/rtl/tbrowse.prg + - removed hidden: clause inside class definition (it doesn't work right now) + * source/rtl/tclass.prg + - commented out line 255 (gives infinite loop) + * utils/hbmake/*.prg + + hbdocdef.ch needs relative path ("..\hbdoc\") to be compiled by gcc system + 2000-12-10 17:09 UTC-0800 Brian Hays * source/rdd/dbfntx/dbfntx1.c * More fixes by Alexander diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg index 82cd12458a..79fbaa1a6c 100644 --- a/harbour/source/rtl/tbrowse.prg +++ b/harbour/source/rtl/tbrowse.prg @@ -150,7 +150,7 @@ CLASS TBrowse METHOD TApplyKey(nKey, o) #endif - HIDDEN: /* H I D D E N */ + /*HIDDEN: /* H I D D E N */ METHOD LeftDetermine() // Determine leftmost unfrozen column in display METHOD DispCell(nColumn, nColor) // Displays a single cell diff --git a/harbour/source/rtl/tclass.prg b/harbour/source/rtl/tclass.prg index 72bd35d2d9..fa1745a28c 100644 --- a/harbour/source/rtl/tclass.prg +++ b/harbour/source/rtl/tclass.prg @@ -252,7 +252,7 @@ STATIC PROCEDURE Create(MetaClass) STATIC FUNCTION Instance() LOCAL Self := QSelf() Local oInstance := __clsInst( ::hClass ) - oInstance:Class := Self:Class + //oInstance:Class := Self:Class RETURN oInstance //----------------------------------------------------------------------------// diff --git a/harbour/utils/hbmake/fclass1.prg b/harbour/utils/hbmake/fclass1.prg index 2391a6819d..f3b24f0bc3 100644 --- a/harbour/utils/hbmake/fclass1.prg +++ b/harbour/utils/hbmake/fclass1.prg @@ -35,7 +35,7 @@ #include "hbclass.ch" #include 'common.ch' -#include 'hbdocdef.ch' +#include '..\hbdoc\hbdocdef.ch' *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 *+ diff --git a/harbour/utils/hbmake/ffile1.prg b/harbour/utils/hbmake/ffile1.prg index 23eefd3fcb..e35c9ada01 100644 --- a/harbour/utils/hbmake/ffile1.prg +++ b/harbour/utils/hbmake/ffile1.prg @@ -35,7 +35,7 @@ #include "hbclass.ch" #include 'common.ch' -#include 'hbdocdef.ch' +#include '..\hbdoc\hbdocdef.ch' *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 *+ diff --git a/harbour/utils/hbmake/ft_funcs.prg b/harbour/utils/hbmake/ft_funcs.prg index 16aaa5fcbc..73ddb5213d 100644 --- a/harbour/utils/hbmake/ft_funcs.prg +++ b/harbour/utils/hbmake/ft_funcs.prg @@ -35,7 +35,7 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' +#include '..\hbdoc\hbdocdef.ch' #include 'common.ch' #define xReadBuffer 4096 @@ -51,7 +51,7 @@ DECLARE GetNumberofTableItems( cBuffer AS STRING ) AS NUMERIC DECLARE FREADline( nH AS NUMERIC, @cB AS STRING, nMaxLine AS NUMERIC ) //DECLARE FILEBASE() AS OBJECT DECLARE FILEBASE ; - New( cname AS STRING) AS CLASS FILEBASE; + New( cname AS STRING) AS CLASS FILEBASE; FOPEN() AS OBJECT; closefile() AS OBJECT; fskip( OPTIONAL n AS NUMERIC) AS OBJECT;