diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fe7df68cbc..63b42062d7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-27 21:57 UTC+0200 Viktor Szakats (harbour syenar.net) + * extras/gtwvw/hbgtwvw.h + * extras/hbvpdf/hbvpdf.prg + * extras/gtwvw/tests/prog0.prg + * extras/gtwvw/tests/prog1.prg + * extras/gtwvw/tests/prog2.prg + ! fixed remaining 8-bit ASCII chars. Now they are only + present in hbtest and codepage source files (where they + generate lots of warnings with Xcode 4.4 / clang). + (plus a few in 3rd party code) + 2012-07-27 20:58 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbmisc/doc/en/dates2.txt * contrib/hbmisc/doc/en/ht_dbf.txt diff --git a/harbour/extras/gtwvw/hbgtwvw.h b/harbour/extras/gtwvw/hbgtwvw.h index 349a87dc94..2d94584c4b 100644 --- a/harbour/extras/gtwvw/hbgtwvw.h +++ b/harbour/extras/gtwvw/hbgtwvw.h @@ -228,7 +228,7 @@ */ #define WVW_DEFAULT_MAX_BMCACHE 20 -/* Como as descri‡δes sΖo grandes, precisei aumetar isso - Peluffo - 26/10/2007 +/* Como as descricoes sao grandes, precisei aumetar isso - Peluffo - 26/10/2007 #define WVW_TB_LABELMAXLENGTH 40 */ #define WVW_TB_LABELMAXLENGTH 100 diff --git a/harbour/extras/gtwvw/tests/prog0.prg b/harbour/extras/gtwvw/tests/prog0.prg index 8eac66c6ca..49651870ed 100644 --- a/harbour/extras/gtwvw/tests/prog0.prg +++ b/harbour/extras/gtwvw/tests/prog0.prg @@ -38,7 +38,7 @@ local i,j for i := 1 to maxrow()-1 for j := 0 to maxcol() devpos(i,j) - devout("±") + devout( hb_UTF8ToStr( "β–’" ) ) next next DISPEND() @@ -64,7 +64,7 @@ local lDone := .f. local getlist := {} local oldCurs := setcursor(SC_NORMAL) - nWin := znewwindow("ΪΔΏ³ΩΔΐ³",10,20,22,59,"Some Window") + nWin := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ),10,20,22,59,"Some Window") //@ 21,21 say "Inside the window" color "R/W" //@ 23,0 say "Outside the window" color "R/W" @@ -98,7 +98,7 @@ FUNCTION xBrowse1() LOCAL nCursor := setCursor( 0 ) LOCAL nWin - USE '..\..\..\tests\TEST' NEW + USE '..\..\..\tests\test' NEW if NetErr() return nil endif @@ -107,8 +107,8 @@ FUNCTION xBrowse1() SetColor( 'N/W*,N/GR*,,,N/W* ' ) oBrowse := TBrowseNew( nTop + 1, nLeft + 1, nBottom - 1, nRight - 1 ) - oBrowse:ColSep := chr(179) //'|' - oBrowse:HeadSep := chr(205) //'_' + oBrowse:ColSep := hb_UTF8ToStr( "β”‚" ) + oBrowse:HeadSep := hb_UTF8ToStr( "─" ) oBrowse:GoTopBlock := { || dbGoTop() } oBrowse:GoBottomBlock := { || dbGoBottom() } oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip,oBrowse ) } @@ -120,7 +120,7 @@ FUNCTION xBrowse1() oBrowse:configure() - nWin := znewwindow("ΪΔΏ³ΩΔΐ³",nTop,nLeft,nBottom,nRight, "test.dbf") + nWin := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ),nTop,nLeft,nBottom,nRight, "test.dbf") While !lEnd oBrowse:ForceStable() @@ -246,7 +246,7 @@ local oldColor := setcolor(s_cStdColor) nRight := nLeft + nWidth + 1 * open window - nWinNum := znewwindow("ΪΔΏ³ΩΔΐ³", nTopLine, nLeft, nBotLine, nRight, cMsg) + nWinNum := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ), nTopLine, nLeft, nBotLine, nRight, cMsg) @ nTopLine+1, nLeft+1 PROMPT padr("Yes", nWidth) @ nTopLine+2, nLeft+1 PROMPT padr("No", nWidth) @@ -288,7 +288,7 @@ local oldColor := setcolor(s_cStdColor) nRight := nLeft + nMaxWidth + 1 * open window - nWinNum := znewwindow("ΪΔΏ³ΩΔΐ³", nTopLine, nLeft, nBotLine, nRight, cTitle) + nWinNum := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ), nTopLine, nLeft, nBotLine, nRight, cTitle) DISPBEGIN() for i := 1 to nNumLines cAline := MEMOLINE(cMsg, nWidth, i) @@ -308,7 +308,7 @@ return .t. FUNCTION ZNEWWINDOW(wtype,r1,c1,r2,c2,ctitle, ccolor) * Draw a new window on screen and register it in window list -* wtype : Window border type, eg. "ΪΔΏ³ΩΔΐ³" +* wtype : Window border type, eg. "β”Œβ”€β”β”‚β”˜β”€β””β”‚" * r1,c1,r2,c2 : coordinates * Return : Numeric id of the new window local i:=len(s_zwin) diff --git a/harbour/extras/gtwvw/tests/prog1.prg b/harbour/extras/gtwvw/tests/prog1.prg index a949b7b3b7..cfa38e735d 100644 --- a/harbour/extras/gtwvw/tests/prog1.prg +++ b/harbour/extras/gtwvw/tests/prog1.prg @@ -62,7 +62,7 @@ local lMainCoord := WVW_SetMainCoord( .t. ) for i := 1 to maxrow()-1 for j := 0 to maxcol() devpos(i,j) - devout("±") + devout( hb_UTF8ToStr( "β–’" ) ) next next DISPEND() @@ -88,7 +88,7 @@ local lDone := .f. local getlist := {} local oldCurs := setcursor(SC_NORMAL) - nWin := znewwindow("ΪΔΏ³ΩΔΐ³",10,20,22,59,"Some Window") + nWin := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ),10,20,22,59,"Some Window") //@ 21,21 say "Inside the window" color "R/W" //@ 23,0 say "Outside the window" color "R/W" @@ -144,7 +144,7 @@ FUNCTION xBrowse1() oBrowse:configure() - nWin := znewwindow("ΪΔΏ³ΩΔΐ³",nTop,nLeft,nBottom,nRight, "test.dbf") + nWin := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ),nTop,nLeft,nBottom,nRight, "test.dbf") While !lEnd oBrowse:ForceStable() @@ -270,7 +270,7 @@ local oldColor := setcolor(s_cStdColor) nRight := nLeft + nWidth + 1 * open window - nWinNum := znewwindow("ΪΔΏ³ΩΔΐ³", nTopLine, nLeft, nBotLine, nRight, cMsg) + nWinNum := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ), nTopLine, nLeft, nBotLine, nRight, cMsg) @ nTopLine+1, nLeft+1 PROMPT padr("Yes", nWidth) @ nTopLine+2, nLeft+1 PROMPT padr("No", nWidth) @@ -312,7 +312,7 @@ local oldColor := setcolor(s_cStdColor) nRight := nLeft + nMaxWidth + 1 * open window - nWinNum := znewwindow("ΪΔΏ³ΩΔΐ³", nTopLine, nLeft, nBotLine, nRight, cTitle) + nWinNum := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ), nTopLine, nLeft, nBotLine, nRight, cTitle) DISPBEGIN() for i := 1 to nNumLines cAline := MEMOLINE(cMsg, nWidth, i) @@ -332,7 +332,7 @@ return .t. FUNCTION ZNEWWINDOW(wtype,r1,c1,r2,c2,ctitle, ccolor) * Draw a new window on screen and register it in window list -* wtype : Window border type, eg. "ΪΔΏ³ΩΔΐ³" +* wtype : Window border type, eg. "β”Œβ”€β”β”‚β”˜β”€β””β”‚" * r1,c1,r2,c2 : coordinates * Return : Numeric id of the new window local i:=len(s_zwin) diff --git a/harbour/extras/gtwvw/tests/prog2.prg b/harbour/extras/gtwvw/tests/prog2.prg index cad83d8d14..18e51bf8e6 100644 --- a/harbour/extras/gtwvw/tests/prog2.prg +++ b/harbour/extras/gtwvw/tests/prog2.prg @@ -59,7 +59,7 @@ local nMaxRow := maxrow(), nMaxCol := maxcol() for i := 1 to maxrow()-1 for j := 0 to maxcol() devpos(i,j) - devout("±") + devout( hb_UTF8ToStr( "β–’" ) ) next next DISPEND() @@ -92,7 +92,7 @@ local oldCurs := setcursor(SC_NORMAL) MEMVAR __temp__ #ENDIF - nWin := znewwindow("ΪΔΏ³ΩΔΐ³",10,20,22,59,"Some Window") + nWin := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ),10,20,22,59,"Some Window") #IFDEF __GTWVW__ AddMiscObjects( nWin, {|nWindow| __temp__:= nWindow, aEval( GetList, {|oGet| WVW_DrawBoxGet( __temp__, oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) @@ -161,7 +161,7 @@ FUNCTION xBrowse1() oBrowse:configure() - nWin := znewwindow("ΪΔΏ³ΩΔΐ³",nTop,nLeft,nBottom,nRight, "test.dbf") + nWin := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ),nTop,nLeft,nBottom,nRight, "test.dbf") #IFDEF __GTWVW__ Wvw_SetPen( 0, 0, rgb( 210,1210,210 ) ) @@ -311,7 +311,7 @@ local oldColor := setcolor(s_cStdColor) nRight := nLeft + nWidth + 1 * open window - nWinNum := znewwindow("ΪΔΏ³ΩΔΐ³", nTopLine, nLeft, nBotLine, nRight, cMsg) + nWinNum := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ), nTopLine, nLeft, nBotLine, nRight, cMsg) @ nTopLine+1, nLeft+1 PROMPT padr("Yes", nWidth) @ nTopLine+2, nLeft+1 PROMPT padr("No", nWidth) @@ -353,7 +353,7 @@ local oldColor := setcolor(s_cStdColor) nRight := nLeft + nMaxWidth + 1 * open window - nWinNum := znewwindow("ΪΔΏ³ΩΔΐ³", nTopLine, nLeft, nBotLine, nRight, cTitle) + nWinNum := znewwindow( hb_UTF8ToStr( "β”Œβ”€β”β”‚β”˜β”€β””β”‚" ), nTopLine, nLeft, nBotLine, nRight, cTitle) DISPBEGIN() for i := 1 to nNumLines cAline := MEMOLINE(cMsg, nWidth, i) @@ -373,7 +373,7 @@ return .t. FUNCTION ZNEWWINDOW(wtype,r1,c1,r2,c2,ctitle, ccolor) * Draw a new window on screen and register it in window list -* wtype : Window border type, eg. "ΪΔΏ³ΩΔΐ³" +* wtype : Window border type, eg. "β”Œβ”€β”β”‚β”˜β”€β””β”‚" * r1,c1,r2,c2 : coordinates * Return : Numeric id of the new window local i:=len(s_zwin) diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index 5e586fa4b0..01d0662926 100644 --- a/harbour/extras/hbvpdf/hbvpdf.prg +++ b/harbour/extras/hbvpdf/hbvpdf.prg @@ -1809,7 +1809,7 @@ local nWidth := 0, nHeight := 0, nBits := 0, nFrom := 0, nLength := 0, xRes := 0 the definition of the field. 8 = SSHORT A 16-bit (2-byte) signed (twos-complement) integer. 9 = SLONG A 32-bit (4-byte) signed (twos-complement) integer. - 10 = SRATIONAL Two SLONG’s: the first represents the numerator of a + 10 = SRATIONAL Two SLONG's: the first represents the numerator of a fraction, the second the denominator. 11 = FLOAT Single precision (4-byte) IEEE format. 12 = DOUBLE Double precision (8-byte) IEEE format.