diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8526edb3af..d99f6f3391 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,13 +8,22 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-04-14 01:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/tbcolumn.prg + + TBColumn() instance variable ordering in class definition + made CA-Cl*pper compatible, so that it's now possible to + access object vars as array elements the same way. + Read-only access is strongly recommended when using this + unofficial access method, and the practice is overall + discouraged. + 2008-04-13 22:16 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbtest/make_c5x.bat * utils/hbtest/hbtest.prg * utils/hbtest/rt_miscc.c * utils/hbtest/rt_misc.prg - Removed dependency on hbclip. - + Added proper C version of hb_SToD() for C5.x compiles. + + Added proper C version of hb_SToD() for C5.x builds. (Needs MSC) ! Refixed hb_SToD() results messed up in my previous commit. Sorry for the confusion, Harbour was perfectly @@ -23,7 +32,7 @@ + Disabling hb_SToD() tests with invalid input values for CA-Cl*pper in case there was no C compiler available when building HBTEST. This is to avoid any invalid - results (due to the .prg version of hb_SToD() and to + results (due to the .prg version of hb_SToD()) and to avoid confusions such as above. 2008-04-13 21:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu) diff --git a/harbour/source/rtl/tbcolumn.prg b/harbour/source/rtl/tbcolumn.prg index 16f95dc82a..0eb9238de2 100644 --- a/harbour/source/rtl/tbcolumn.prg +++ b/harbour/source/rtl/tbcolumn.prg @@ -6,6 +6,7 @@ * Harbour Project source code: * TBColumn Class * + * Copyright 2007-2008 Viktor Szakats * Copyright 1999 Antonio Linares * www - http://www.harbour-project.org * @@ -67,42 +68,41 @@ CREATE CLASS TBColumn EXPORT: - VAR cargo // User-definable variable - VAR picture // Column picture string - - METHOD block( bBlock ) SETGET // Code block to retrieve data for the column - METHOD colorBlock( bColorBlock ) SETGET // Code block that determines color of data items - METHOD defColor( aDefColor ) SETGET // Array of numeric indexes into the color table - METHOD colSep( cColSep ) SETGET // Column separator character - METHOD heading( cHeading ) SETGET // Column heading - METHOD footing( cFooting ) SETGET // Column footing - METHOD headSep( cHeadSep ) SETGET // Heading separator character - METHOD footSep( cFootSep ) SETGET // Footing separator character - METHOD width( nWidth ) SETGET // Column display width -#ifdef HB_COMPAT_C53 - METHOD preBlock( bPreBlock ) SETGET // Code block determining editing - METHOD postBlock( bPostBlock ) SETGET // Code block validating values - METHOD setStyle( nStyle, lSetting ) -#endif - - METHOD New( cHeading, bBlock ) /* NOTE: This method is a Harbour extension [vszakats] */ - - PROTECTED: - - VAR bBlock - VAR bColorBlock INIT {|| NIL } - VAR aDefColor INIT { 1, 2 } /* NOTE: Default value for both CA-Cl*pper 5.2 and 5.3. */ - VAR cColSep - VAR cHeading INIT "" - VAR cFooting INIT "" - VAR cFootSep - VAR cHeadSep - VAR nWidth + /* === Start of CA-Cl*pper compatible TBColumn instance area === */ + VAR cargo // 01. User-definable variable + VAR nWidth PROTECTED // 02. + VAR bBlock PROTECTED // 03. + VAR aDefColor PROTECTED INIT { 1, 2 } // 04. /* NOTE: Default value for both CA-Cl*pper 5.2 and 5.3. */ + VAR bColorBlock PROTECTED INIT {|| NIL } // 05. + VAR cHeading PROTECTED INIT "" // 06. + VAR cHeadSep PROTECTED // 07. + VAR cColSep PROTECTED // 08. + VAR cFootSep PROTECTED // 09. + VAR cFooting PROTECTED INIT "" // 10. + VAR picture // 11. Column picture string #ifdef HB_COMPAT_C53 - VAR bPreBlock - VAR bPostBlock - VAR aSetStyle INIT { .F., .F., .F. } /* TBC_READWRITE, TBC_MOVE, TBC_SIZE */ + VAR bPreBlock PROTECTED // 12. + VAR bPostBlock PROTECTED // 13. + VAR aSetStyle PROTECTED INIT { .F., .F., .F. } // 14. /* TBC_READWRITE, TBC_MOVE, TBC_SIZE */ #endif + /* === End of CA-Cl*pper compatible TBColumn instance area === */ + + METHOD block( bBlock ) SETGET // Code block to retrieve data for the column + METHOD colorBlock( bColorBlock ) SETGET // Code block that determines color of data items + METHOD defColor( aDefColor ) SETGET // Array of numeric indexes into the color table + METHOD colSep( cColSep ) SETGET // Column separator character + METHOD heading( cHeading ) SETGET // Column heading + METHOD footing( cFooting ) SETGET // Column footing + METHOD headSep( cHeadSep ) SETGET // Heading separator character + METHOD footSep( cFootSep ) SETGET // Footing separator character + METHOD width( nWidth ) SETGET // Column display width +#ifdef HB_COMPAT_C53 + METHOD preBlock( bPreBlock ) SETGET // Code block determining editing + METHOD postBlock( bPostBlock ) SETGET // Code block validating values + METHOD setStyle( nStyle, lSetting ) +#endif + + METHOD New( cHeading, bBlock ) /* NOTE: This method is a Harbour extension [vszakats] */ ENDCLASS