From c60db4b7aae5a254056392e5bd1959a6f00a1f36 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 4 Feb 2009 22:14:46 +0000 Subject: [PATCH] 2009-02-04 23:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/rtl/tget.prg * source/rtl/tgetx.prg * source/rtl/tbcolumn.prg * source/rtl/tbrowse.prg * Reset internal name of GET(), TBROWSE(), TBCOLUMN(), because even if Clipper doesn't have such public symbols, Class(y) has them, and we want to maintain compatibility. * include/hbextern.ch + Added GET, TBROWSE, TBCOLUMN. --- harbour/ChangeLog | 13 +++++++++++++ harbour/include/hbextern.ch | 3 +++ harbour/source/rtl/tbcolumn.prg | 6 +++--- harbour/source/rtl/tbrowse.prg | 6 +++--- harbour/source/rtl/tget.prg | 4 ++-- harbour/source/rtl/tgetx.prg | 2 +- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c0e024bc82..9cef20a5b0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-04 23:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/tget.prg + * source/rtl/tgetx.prg + * source/rtl/tbcolumn.prg + * source/rtl/tbrowse.prg + * Reset internal name of GET(), TBROWSE(), TBCOLUMN(), + because even if Clipper doesn't have such public + symbols, Class(y) has them, and we want to maintain + compatibility. + + * include/hbextern.ch + + Added GET, TBROWSE, TBCOLUMN. + 2009-02-04 23:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/examples/hbsqlit2/tests/hbmk_b32.bat * contrib/examples/hbsqlit2/tests/hbmk_vc.bat diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 23be05edc2..96dc33456d 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -1314,6 +1314,9 @@ EXTERNAL HB_GZCLEARERR EXTERNAL HBCLASS EXTERNAL HBOBJECT EXTERNAL HBSCALAR +EXTERNAL GET +EXTERNAL TBROWSE +EXTERNAL TBCOLUMN #ifdef HB_REQUEST_SCALAR EXTERNAL HBARRAY EXTERNAL HBBLOCK diff --git a/harbour/source/rtl/tbcolumn.prg b/harbour/source/rtl/tbcolumn.prg index 52e40edaaf..2d192ee3d9 100644 --- a/harbour/source/rtl/tbcolumn.prg +++ b/harbour/source/rtl/tbcolumn.prg @@ -58,7 +58,7 @@ /* NOTE: In CA-Cl*pper TBCOLUMN class does not inherit from any other classes. */ -CREATE CLASS TBCOLUMN FUNCTION HBBColumn +CREATE CLASS TBCOLUMN EXPORTED: @@ -215,11 +215,11 @@ METHOD New( cHeading, bBlock ) CLASS TBCOLUMN RETURN Self FUNCTION TBColumnNew( cHeading, bBlock ) - RETURN HBBColumn():New( cHeading, bBlock ) + RETURN TBColumn():New( cHeading, bBlock ) #ifdef HB_COMPAT_XPP -CREATE CLASS xpp_TBColumn INHERIT HBBColumn +CREATE CLASS xpp_TBColumn INHERIT TBColumn ENDCLASS #endif diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg index 054401895f..dc7680dbbf 100644 --- a/harbour/source/rtl/tbrowse.prg +++ b/harbour/source/rtl/tbrowse.prg @@ -109,7 +109,7 @@ #define _TBR_COORD( n ) Int( n ) -CREATE CLASS TBROWSE FUNCTION HBBrowse +CREATE CLASS TBROWSE /* The first 18 instance variables are exactly the same as in Clipper * so also some code which access them directly by array indexes should work @@ -310,7 +310,7 @@ ENDCLASS FUNCTION TBrowseNew( nTop, nLeft, nBottom, nRight ) - RETURN HBBrowse():new( nTop, nLeft, nBottom, nRight ) + RETURN TBrowse():new( nTop, nLeft, nBottom, nRight ) METHOD new( nTop, nLeft, nBottom, nRight ) CLASS TBROWSE @@ -2759,7 +2759,7 @@ FUNCTION TBMouse( oBrw, nMRow, nMCol ) #ifdef HB_COMPAT_XPP -CREATE CLASS xpp_TBrowse INHERIT HBBrowse +CREATE CLASS xpp_TBrowse INHERIT TBrowse EXPORTED: diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index 7568012dde..0e0fdb150e 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -70,7 +70,7 @@ /* NOTE: In CA-Cl*pper, TGET class does not inherit from any other classes. */ -CREATE CLASS GET FUNCTION HBGet +CREATE CLASS GET PROTECTED: @@ -1955,4 +1955,4 @@ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS GET RETURN Self FUNCTION GetNew( nRow, nCol, bVarBlock, cVarName, cPicture, cColor ) - RETURN HBGet():New( nRow, nCol, bVarBlock, cVarName, cPicture, cColor ) + RETURN Get():New( nRow, nCol, bVarBlock, cVarName, cPicture, cColor ) diff --git a/harbour/source/rtl/tgetx.prg b/harbour/source/rtl/tgetx.prg index 7cc1f3c8f5..ce2421e26b 100644 --- a/harbour/source/rtl/tgetx.prg +++ b/harbour/source/rtl/tgetx.prg @@ -56,7 +56,7 @@ #ifdef HB_COMPAT_XPP -CREATE CLASS xpp_Get INHERIT HBGet +CREATE CLASS xpp_Get INHERIT Get EXPORTED: