From 4a9809fedcfdaecfe34a9eb6d9c16789df2279a4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 2 Oct 2012 09:28:20 +0000 Subject: [PATCH] 2012-10-02 11:26 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbnf/popadder.prg * src/rtl/listbox.prg * src/rtl/scrollbr.prg * src/rtl/tmenuitm.prg * tests/db_brows.prg ! reverted to use plain Chr() for low-ASCII (0-31) drawing chars (hb_UTF8ToStr*() converts these to "?", which is expected) --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/hbnf/popadder.prg | 6 +++--- harbour/src/rtl/listbox.prg | 2 +- harbour/src/rtl/scrollbr.prg | 8 ++++---- harbour/src/rtl/tmenuitm.prg | 2 +- harbour/tests/db_brows.prg | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 45d971aba4..0ad5583e61 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-02 11:26 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbnf/popadder.prg + * src/rtl/listbox.prg + * src/rtl/scrollbr.prg + * src/rtl/tmenuitm.prg + * tests/db_brows.prg + ! reverted to use plain Chr() for low-ASCII (0-31) drawing chars + (hb_UTF8ToStr*() converts these to "?", which is expected) + 2012-10-02 10:58 UTC+0200 Viktor Szakats (harbour syenar.net) * tests/tstdspac.prg ! fixed two problems diff --git a/harbour/contrib/hbnf/popadder.prg b/harbour/contrib/hbnf/popadder.prg index 56421ea16d..9edf85f81b 100644 --- a/harbour/contrib/hbnf/popadder.prg +++ b/harbour/contrib/hbnf/popadder.prg @@ -252,7 +252,7 @@ FUNCTION FT_Adder() CASE ( nKey == 83 .OR. nKey == 115 ) .AND. lTape // Scroll tape display IF nTotTran > 16 // We need to scroll SetColor( "GR+/W" ) - @ 21 + nTopOS, 8 + nTapeSpace SAY hb_UTF8ToStr( " ↑↓-SCROLL -QUIT " ) + @ 21 + nTopOS, 8 + nTapeSpace SAY " " + /* LOW-ASCII "↑↓" */ Chr( 24 ) + Chr( 25 ) + "-SCROLL -QUIT " SetColor( "N/W,W+/N" ) AChoice( 5 + nTopOS, 7 + nTapeSpace, 20 + nTopOS, 32 + nTapeSpace, aTrans, .T. , ; "_ftAdderTapeUDF", nTotTran, 20 ) @@ -358,7 +358,7 @@ STATIC FUNCTION _ftAddScreen( aAdder ) @ 8 + nTopOS, nCol SAY "-" @ 13 + nTopOS, nCol SAY "+" @ 18 + nTopOS, nCol SAY "=" - @ 19 + nTopOS, nCol SAY hb_UTF8ToStr( "♦" ) + @ 19 + nTopOS, nCol SAY Chr( 4 ) /* LOW-ASCII "♦" */ _ftSetWinColor( W_CURR, W_PROMPT ) @ 3 + nTopOS, 6 + nAddSpace, 5 + nTopOS, 27 + nAddSpace BOX B_DOUBLE @@ -1181,7 +1181,7 @@ STATIC FUNCTION _ftQuest( cMessage, xVarVal, cPict, bValid, lNoESC, nWinColor, n nRight := nLeft + nWide + 4 _ftPushWin( nTop, nLeft, nBottom, nRight, "QUESTION ?", iif( HB_ISSTRING( xVarVal ) ; - .AND. nVarLen > nWide, hb_UTF8ToStr( "← scroll →" ), NIL ), nWinColor ) + .AND. nVarLen > nWide, /* LOW-ASCII "←" */ Chr( 27 ) + " scroll " + Chr( 26 ) /* LOW-ASCII "→" */, NIL ), nWinColor ) DISPMESSAGE cMessage, nTop + 1, nLeft + 2, nBottom - 1, nRight - 2 oNewGet := GetNew( iif( lGetOnNextLine,Row() + 1,Row() ), ; diff --git a/harbour/src/rtl/listbox.prg b/harbour/src/rtl/listbox.prg index cafaf59e67..a0537eb277 100644 --- a/harbour/src/rtl/listbox.prg +++ b/harbour/src/rtl/listbox.prg @@ -148,7 +148,7 @@ CREATE CLASS LISTBOX FUNCTION HBListBox VAR cMessage INIT "" VAR nRight VAR bSBlock - VAR cStyle INIT hb_UTF8ToStr( "▼" ) + VAR cStyle INIT Chr( 31 ) /* LOW-ASCII "▼" */ VAR cTextValue INIT "" VAR nTop VAR nTopItem INIT 0 diff --git a/harbour/src/rtl/scrollbr.prg b/harbour/src/rtl/scrollbr.prg index e6daf2248b..13ac6820c9 100644 --- a/harbour/src/rtl/scrollbr.prg +++ b/harbour/src/rtl/scrollbr.prg @@ -391,10 +391,10 @@ METHOD CalcThumbPos() CLASS SCROLLBAR /* New definitions for better coding. These are screen codepage dependent, but can be changed with the setStyle method. */ -#define SB_UPARROW hb_UTF8ToStr( "↑" ) -#define SB_DNARROW hb_UTF8ToStr( "↓" ) -#define SB_RIGHTARROW hb_UTF8ToStr( "→" ) -#define SB_LEFTARROW hb_UTF8ToStr( "←" ) +#define SB_UPARROW Chr( 24 ) /* LOW-ASCII "↑" */ +#define SB_DNARROW Chr( 25 ) /* LOW-ASCII "↓" */ +#define SB_RIGHTARROW Chr( 27 ) /* LOW-ASCII "→" */ +#define SB_LEFTARROW Chr( 26 ) /* LOW-ASCII "←" */ #define SB_THUMB hb_UTF8ToStr( "░" ) #define SB_TRACK hb_UTF8ToStr( "▓" ) diff --git a/harbour/src/rtl/tmenuitm.prg b/harbour/src/rtl/tmenuitm.prg index 41d3e4ba62..924bf275e9 100644 --- a/harbour/src/rtl/tmenuitm.prg +++ b/harbour/src/rtl/tmenuitm.prg @@ -90,7 +90,7 @@ CREATE CLASS MENUITEM FUNCTION HBMenuItem VAR nID VAR cMessage VAR nShortcut - VAR cStyle INIT hb_UTF8ToStr( "√►" ) + VAR cStyle INIT hb_UTF8ToStr( "√" ) + Chr( 16 ) /* LOW-ASCII "►" */ ENDCLASS diff --git a/harbour/tests/db_brows.prg b/harbour/tests/db_brows.prg index 1bbf3b5b56..84966bf7ec 100644 --- a/harbour/tests/db_brows.prg +++ b/harbour/tests/db_brows.prg @@ -149,7 +149,7 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey ) PRIVATE str_barbox := hb_UTF8ToStrBox( "│" ) ENDIF IF !( Type( "str_bar" ) == "C" ) - PRIVATE str_bar := hb_UTF8ToStr( "■" ) + PRIVATE str_bar := /* LOW-ASCII "▼▲" */ Chr( 31 ) + Chr( 30 ) + hb_UTF8ToStr( "■" ) ENDIF LI_Y1 := y1 LI_X1 := x1