diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c38add09b6..38c499e66e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-22 20:08 UTC+0200 Viktor Szakats (vszakats syenar.net) + * include/hbapigt.h + * tests/db_brows.prg + ! fixes to prev + 2012-07-22 19:45 UTC+0200 Viktor Szakats (vszakats syenar.net) * extras/hbapollo/hbapollo.hbp + utilize original COFF implibs provided by the vendor diff --git a/harbour/include/hbapigt.h b/harbour/include/hbapigt.h index 199e450895..2be3207c98 100644 --- a/harbour/include/hbapigt.h +++ b/harbour/include/hbapigt.h @@ -101,14 +101,14 @@ HB_EXTERN_BEGIN #define HB_GT_ATTR_REFRESH 0x80 /* strings for borders (same as box.ch, but defined for use by C) */ -#define _B_SINGLE "\xDA\xC4\xBF\xB3\xD9\xC4\xC0\xB3" /* "Ŀ" */ -#define _B_DOUBLE "\xC9\xCD\xBB\xBA\xBC\xCD\xC8\xBA" /* "ͻȺ" */ -#define _B_SINGLE_DOUBLE "\xD6\xC4\xB7\xBA\xBD\xC4\xD3\xBA" /* "ķӺ" */ -#define _B_DOUBLE_SINGLE "\xD5\xCD\xB8\xB3\xBE\xCD\xD4\xB3" /* "͸Գ" */ -#define HB_B_SINGLE_V '\xB3' /* '' */ -#define HB_B_SINGLE_H '\xC4' /* '' */ -#define HB_B_DOUBLE_V '\xBA' /* '' */ -#define HB_B_DOUBLE_H '\xCD' /* '' */ +#define _B_SINGLE "\xDA\xC4\xBF\xB3\xD9\xC4\xC0\xB3" /* "┌─┐│┘─└│" */ +#define _B_DOUBLE "\xC9\xCD\xBB\xBA\xBC\xCD\xC8\xBA" /* "╔═╗║╝═╚║" */ +#define _B_SINGLE_DOUBLE "\xD6\xC4\xB7\xBA\xBD\xC4\xD3\xBA" /* "╓─╖║╜─╙║" */ +#define _B_DOUBLE_SINGLE "\xD5\xCD\xB8\xB3\xBE\xCD\xD4\xB3" /* "╒═╕│╛═╘│" */ +#define HB_B_SINGLE_V '\xB3' /* '│' */ +#define HB_B_SINGLE_H '\xC4' /* '─' */ +#define HB_B_DOUBLE_V '\xBA' /* '║' */ +#define HB_B_DOUBLE_H '\xCD' /* '═' */ #define HB_B_SINGLE_W { 0x250C, 0x2500, 0x2510, 0x2502, 0x2518, 0x2500, 0x2514, 0x2502, 0x0000 } #define HB_B_DOUBLE_W { 0x2554, 0x2550, 0x2557, 0x2551, 0x255D, 0x2550, 0x255A, 0x2551, 0x0000 } diff --git a/harbour/tests/db_brows.prg b/harbour/tests/db_brows.prg index 13caf8d5b9..f11a2dd404 100644 --- a/harbour/tests/db_brows.prg +++ b/harbour/tests/db_brows.prg @@ -365,7 +365,7 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey ) Eval( LI_BSKIP, mslist, LI_NSTR - 1 ) ENDIF VIVNAMES( mslist, LI_NLEFT ) - CASE xkey == 19 // èπαß«α ó½Ñó« + CASE xkey == 19 IF predit > 1 IF LI_COLPOS != 1 LI_COLPOS -- @@ -417,7 +417,6 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey ) rezproc := xkey CASE ( xkey == 13 .OR. ( xkey > 47 .AND. xkey < 58 ) .OR. ( xkey > 64 .AND. xkey < 91 ) ; .OR. ( xkey > 96 .AND. xkey < 123 ) .OR. ( xkey > 127 .AND. xkey < 176 ) .OR. ( xkey > 223 .AND. xkey < 240 ) ) .AND. predit > 1 // Enter - // ÉÑñá¬Γ¿α«óá¡¿Ñ fipos := LI_COLPOS + LI_NLEFT - 1 - LI_FREEZE IF LI_WHEN == Nil .OR. Len( LI_WHEN ) < fipos .OR. LI_WHEN[ fipos ] == Nil .OR. Eval( LI_WHEN[ fipos ] ) IF ValType( LI_MSED ) != "N"