diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4c92a463ac..fac1fd7643 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-02 21:43 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbct/tests/ctwtest.prg + * contrib/hbcurl/tests/ftp_uldl.prg + * contrib/hbnf/clrsel.prg + * contrib/hbnf/dispmsg.prg + * contrib/hbnf/menutonf.prg + * extras/gfspell/spell.prg + * extras/gtwvw/tests/prog0.prg + * extras/gtwvw/tests/prog1.prg + * extras/gtwvw/tests/prog2.prg + * extras/gtwvw/tests/wvwtest9.prg + * tests/wvtext.prg + * cleanups targeting usage of MT-friendly GT HB_DISP*() calls + * formatting + 2012-10-02 21:14 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbct/tests/*.prg * tests/tstuse.prg diff --git a/harbour/contrib/hbct/tests/ctwtest.prg b/harbour/contrib/hbct/tests/ctwtest.prg index fb4911de7d..71f05e8571 100644 --- a/harbour/contrib/hbct/tests/ctwtest.prg +++ b/harbour/contrib/hbct/tests/ctwtest.prg @@ -23,7 +23,7 @@ PROCEDURE Main() wsetshadow( 7 ) setclearA( 10 * 16 + 14 ) setclearB( 35 ) - DispBox( 0, 0, MaxRow(), MaxCol(), repl( "#",9 ), ntocolor( 10 * 16 + 14 ) ) + DispBox( 0, 0, MaxRow(), MaxCol(), replicate( "#", 9 ), ntocolor( 10 * 16 + 14 ) ) SetPos( 0, 0 ) ? "GT driver: " + hb_gtVersion() ? hb_gtVersion( 1 ) @@ -40,25 +40,25 @@ PROCEDURE Main() ? "arrows - window move " setclearB( 61 ) - for i := 1 TO Len( aWin ) + FOR i := 1 TO Len( aWin ) y := i + 2 x := i * 4 + 10 SetColor( ntocolor( i * 16 + 15 ) + ",W+/B*" ) wsetshadow( i % 8 ) - aWin[i] := wopen( y, x, y + 10, x + 20 ) + aWin[ i ] := wopen( y, x, y + 10, x + 20 ) wbox() - @ - 1, 0 SAY "TITLE " + hb_ntos( aWin[i] ) + @ - 1, 0 SAY "TITLE " + hb_ntos( aWin[ i ] ) ? hb_ntos( Row() ) + ":" + hb_ntos( Col() ), "/", hb_ntos( MaxRow() ) + ":" + hb_ntos( MaxCol() ), "" ? hb_ntos( wrow() ) + ":" + hb_ntos( wcol() ), "/", hb_ntos( MaxRow( .T. ) ) + ":" + hb_ntos( MaxCol( .T. ) ), "" ? hb_ntos( wfrow() ) + ":" + hb_ntos( wfcol() ), "/", ; hb_ntos( wflastrow() ) + ":" + hb_ntos( wflastcol() ), "" ? hb_ntos( wfrow( .T. ) ) + ":" + hb_ntos( wfcol( .T. ) ), "/", ; hb_ntos( wflastrow( .T. ) ) + ":" + hb_ntos( wflastcol( .T. ) ), "" - ? "window:", hb_ntos( aWin[i] ), "" + ? "window:", hb_ntos( aWin[ i ] ), "" SetCursor( Int( i % 5 ) ) - next + NEXT dspcord() WHILE .T. @@ -66,7 +66,7 @@ PROCEDURE Main() IF k == K_ESC EXIT ELSEIF k >= Asc( "1" ) .AND. k <= Asc( "9" ) - wselect( aWin[k-asc("0")] ) + wselect( aWin[ k - Asc( "0" ) ] ) ELSEIF k == Asc( "0" ) wselect( 0 ) ELSEIF k == Asc( "C" ) .OR. k == Asc( "c" ) @@ -89,7 +89,7 @@ PROCEDURE Main() wselect( i ) ELSEIF k == K_INS lFlag := !lFlag - SetCursor( iif( lFlag,3,1 ) ) + SetCursor( iif( lFlag, 3, 1 ) ) ELSEIF k == K_DEL SetCursor( SC_NONE ) ELSEIF k == K_LEFT @@ -111,8 +111,8 @@ STATIC PROC dspcord() LOCAL mr := MRow(), mc := MCol(), r := wrow(), c := wcol(), w := wselect() wselect( 0 ) - @ MaxRow(), 0 SAY PadR( "WPOS(" + LTrim( Str(r ) ) + "," + LTrim( Str(c ) ) + ")" + ; - iif( MPresent(), "MPOS(" + LTrim( Str(mr ) ) + "," + LTrim( Str(mc ) ) + ")", "" ), MaxCol() + 1 ) + @ MaxRow(), 0 SAY PadR( "WPOS(" + LTrim( Str( r ) ) + "," + LTrim( Str( c ) ) + ")" + ; + iif( MPresent(), "MPOS(" + LTrim( Str( mr ) ) + "," + LTrim( Str( mc ) ) + ")", "" ), MaxCol() + 1 ) wselect( w ) RETURN diff --git a/harbour/contrib/hbcurl/tests/ftp_uldl.prg b/harbour/contrib/hbcurl/tests/ftp_uldl.prg index 0df44df3d3..f23e7c0b5a 100644 --- a/harbour/contrib/hbcurl/tests/ftp_uldl.prg +++ b/harbour/contrib/hbcurl/tests/ftp_uldl.prg @@ -60,7 +60,7 @@ PROCEDURE Main( cDL, cUL ) ? curl_easy_setopt( curl, HB_CURLOPT_UL_FILE_SETUP, cUL ) ? curl_easy_setopt( curl, HB_CURLOPT_INFILESIZE, hb_FSize( cUL ) ), hb_FSize( cUL ) // ? curl_easy_setopt( curl, HB_CURLOPT_USERPWD, "harbour:power" ) /* May use this instead of embedding in URL */ - ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), DispOutAt( 10, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) + ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), hb_DispOutAt( 10, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) ? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_POSTQUOTE, { "RNFR " + UPLOAD_FILE_AS, "RNTO " + RENAME_FILE_TO } ) ? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, lVerbose ) @@ -107,7 +107,7 @@ PROCEDURE Main( cDL, cUL ) ? curl_easy_setopt( curl, HB_CURLOPT_UL_BUFF_SETUP, tmp ) ? curl_easy_setopt( curl, HB_CURLOPT_INFILESIZE, Len( tmp ) ), Len( tmp ) // ? curl_easy_setopt( curl, HB_CURLOPT_USERPWD, "harbour:power" ) /* May use this instead of embedding in URL */ - ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), DispOutAt( 10, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) + ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), hb_DispOutAt( 10, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) ? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, lVerbose ) @@ -130,7 +130,7 @@ PROCEDURE Main( cDL, cUL ) ? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYPEER, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYHOST, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_DL_FILE_SETUP, "test_dl.bin" ) - ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) + ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), hb_DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) ? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, lVerbose ) @@ -148,7 +148,7 @@ PROCEDURE Main( cDL, cUL ) ? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYPEER, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYHOST, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_DL_BUFF_SETUP ) - ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) + ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), hb_DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) ? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, lVerbose ) @@ -177,7 +177,7 @@ PROCEDURE Main( cDL, cUL ) ? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYPEER, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_SSL_VERIFYHOST, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_DL_BUFF_SETUP ) - ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) + ? curl_easy_setopt( curl, HB_CURLOPT_PROGRESSBLOCK, {| nPos, nLen | a := CurGet(), hb_DispOutAt( 11, 10, Str( ( nPos / nLen ) * 100, 6, 2 ) + "%" ), CurSet( a ) } ) ? curl_easy_setopt( curl, HB_CURLOPT_NOPROGRESS, .F. ) ? curl_easy_setopt( curl, HB_CURLOPT_VERBOSE, lVerbose ) diff --git a/harbour/contrib/hbnf/clrsel.prg b/harbour/contrib/hbnf/clrsel.prg index 5ccc1cd7c3..4eb1732f77 100644 --- a/harbour/contrib/hbnf/clrsel.prg +++ b/harbour/contrib/hbnf/clrsel.prg @@ -73,7 +73,7 @@ @ , CLEAR TO , #translate BkGrnd( , , , , ) =>; - DispBox( , , , , Replicate( , 9 ) ) + hb_DispBox( , , , , Replicate( , 9 ) ) //------------------------------------------------ // Demo of FT_ClrSel() diff --git a/harbour/contrib/hbnf/dispmsg.prg b/harbour/contrib/hbnf/dispmsg.prg index 2e2375754b..ecbf196f65 100644 --- a/harbour/contrib/hbnf/dispmsg.prg +++ b/harbour/contrib/hbnf/dispmsg.prg @@ -107,7 +107,7 @@ FUNCTION FT_DispMsg( aInfo, cKey, nBoxTop, nBoxLeft, cnBoxString, lShadow ) // draw box cOldColor := SetColor( aInfo[ 2, Len( aInfo[ 2 ] ) ] ) - DispBox( nBoxTop, nBoxLeft, nBoxBottom, nBoxRight, cnBoxString, ; + hb_DispBox( nBoxTop, nBoxLeft, nBoxBottom, nBoxRight, cnBoxString, ; aInfo[ 2, Len( aInfo[ 2 ] ) ] ) IF lShadow hb_Shadow( nBoxTop, nBoxLeft, nBoxBottom, nBoxRight ) diff --git a/harbour/contrib/hbnf/menutonf.prg b/harbour/contrib/hbnf/menutonf.prg index 50c02b92c6..f937356059 100644 --- a/harbour/contrib/hbnf/menutonf.prg +++ b/harbour/contrib/hbnf/menutonf.prg @@ -36,9 +36,6 @@ #include "setcurs.ch" #include "inkey.ch" -#xtranslate display( , , , ) => ; - SetPos( , ); DispOut( , ) - #xtranslate EnhColor( ) => ; SubStr( , At( ",", ) + 1 ) @@ -151,8 +148,8 @@ FUNCTION FT_Prompt( nRow, nCol, cPrompt, cColor, ; // Now display the prompt for the sake of compatibility DispBegin() - DISPLAY( nRow, nCol, cPrompt, cColor ) - DISPLAY( nRow, nCol - 1 + nTrigger, cTrigger, cTriggerColor ) + hb_DispOutAt( nRow, nCol, cPrompt, cColor ) + hb_DispOutAt( nRow, nCol - 1 + nTrigger, cTrigger, cTriggerColor ) DispEnd() RETURN NIL @@ -234,7 +231,7 @@ FUNCTION FT_MenuTo( bGetSet, cReadVar, lCold ) t_aMsgRow[ nCurrent ], t_aMsgCol[ nCurrent ] + ; Len( t_aMessage[ nCurrent ] ) - 1 ) - DISPLAY( t_aMsgRow[ nCurrent ], t_aMsgCol[ nCurrent ], ; + hb_DispOutAt( t_aMsgRow[ nCurrent ], t_aMsgCol[ nCurrent ], ; t_aMessage[ nCurrent ], t_aMsgColor[ nCurrent ] ) ELSE @@ -244,10 +241,10 @@ FUNCTION FT_MenuTo( bGetSet, cReadVar, lCold ) // Display the prompt using the designated colors for the prompt and // the trigger character. - DISPLAY( t_aRow[ nCurrent ], t_aCol[ nCurrent ], ; + hb_DispOutAt( t_aRow[ nCurrent ], t_aCol[ nCurrent ], ; t_aPrompt[ nCurrent ], EnhColor( t_aColor[ nCurrent ] ) ) - DISPLAY( t_aRow[ nCurrent ], ; + hb_DispOutAt( t_aRow[ nCurrent ], ; t_aCol[ nCurrent ] - 1 + t_aTrigger[ nCurrent ], ; SubStr( t_aPrompt[ nCurrent ], t_aTrigger[ nCurrent ], 1 ), ; EnhColor( t_aTriggerColor[ nCurrent ] ) ) @@ -367,10 +364,10 @@ FUNCTION FT_MenuTo( bGetSet, cReadVar, lCold ) IF ! lChoice DispBegin() - DISPLAY( t_aRow[ nLast ], t_aCol[ nLast ], ; + hb_DispOutAt( t_aRow[ nLast ], t_aCol[ nLast ], ; t_aPrompt[ nLast ], t_aColor[ nLast ] ) - DISPLAY( t_aRow[ nLast ], t_aCol[ nLast ] - 1 + t_aTrigger[ nLast ], ; + hb_DispOutAt( t_aRow[ nLast ], t_aCol[ nLast ] - 1 + t_aTrigger[ nLast ], ; SubStr( t_aPrompt[ nLast ], t_aTrigger[ nLast ], 1 ), ; t_aTriggerColor[ nLast ] ) diff --git a/harbour/extras/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg index 764544932c..de072c0281 100644 --- a/harbour/extras/gfspell/spell.prg +++ b/harbour/extras/gfspell/spell.prg @@ -1207,7 +1207,7 @@ endif if lTalk cSave := SaveScreen(8,30,11,48) - DispBox(8,30,11,48,,"W+/R") + hb_DispBox(8,30,11,48,,"W+/R") @ 8,33 say " Creating DIC " color "W+/R" @ 9,31 say " Indexing words " color "W/R" @ 10,31 say " " color "W/R" @@ -1374,7 +1374,7 @@ use (cDbf) alias DICT new if lTalk cSave := SaveScreen(8,30,12,48) - DispBox(8,30,12,48,,"W+/R") + hb_DispBox(8,30,12,48,,"W+/R") @ 8,34 say " Creating DBF " color "W+/R" @ 9,31 say "Percent " color "W/R" @ 10,31 say "Complete: " color "W/R" diff --git a/harbour/extras/gtwvw/tests/prog0.prg b/harbour/extras/gtwvw/tests/prog0.prg index 87e3e08a77..6715efd3cb 100644 --- a/harbour/extras/gtwvw/tests/prog0.prg +++ b/harbour/extras/gtwvw/tests/prog0.prg @@ -327,7 +327,7 @@ FUNCTION ZNEWWINDOW(wtype,r1,c1,r2,c2,ctitle, ccolor) scroll(r1, c1, r2, c2) * GTWVW doesn't need box or textual title - DISPBOX(r1,c1,r2,c2,wtype) + hb_DISPBOX(r1,c1,r2,c2,wtype) if !empty(ctitle) cTitle := " " + alltrim(ctitle) + " " DevPos( r1, nCeiling( (c2+c1-len(cTitle))/2 ) ) diff --git a/harbour/extras/gtwvw/tests/prog1.prg b/harbour/extras/gtwvw/tests/prog1.prg index fd32d97ac1..f8e40afd49 100644 --- a/harbour/extras/gtwvw/tests/prog1.prg +++ b/harbour/extras/gtwvw/tests/prog1.prg @@ -356,7 +356,7 @@ FUNCTION ZNEWWINDOW(wtype,r1,c1,r2,c2,ctitle, ccolor) #IFNDEF __GTWVW__ * GTWVW doesn't need box or textual title - DISPBOX(r1,c1,r2,c2,wtype) + hb_DISPBOX(r1,c1,r2,c2,wtype) if !empty(ctitle) cTitle := " " + alltrim(ctitle) + " " DevPos( r1, nCeiling( (c2+c1-len(cTitle))/2 ) ) diff --git a/harbour/extras/gtwvw/tests/prog2.prg b/harbour/extras/gtwvw/tests/prog2.prg index 5449362675..75e2ae26c2 100644 --- a/harbour/extras/gtwvw/tests/prog2.prg +++ b/harbour/extras/gtwvw/tests/prog2.prg @@ -398,7 +398,7 @@ FUNCTION ZNEWWINDOW(wtype,r1,c1,r2,c2,ctitle, ccolor) #IFNDEF __GTWVW__ * GTWVW doesn't need box or textual title - DISPBOX(r1,c1,r2,c2,wtype) + hb_DISPBOX(r1,c1,r2,c2,wtype) if !empty(ctitle) cTitle := " " + alltrim(ctitle) + " " DevPos( r1, nCeiling( (c2+c1-len(cTitle))/2 ) ) diff --git a/harbour/extras/gtwvw/tests/wvwtest9.prg b/harbour/extras/gtwvw/tests/wvwtest9.prg index f5f14ee298..35cb64b01d 100644 --- a/harbour/extras/gtwvw/tests/wvwtest9.prg +++ b/harbour/extras/gtwvw/tests/wvwtest9.prg @@ -572,7 +572,7 @@ FUNCTION DEMO_Browse() nHScrollBar := wvw_xbCreate( nCurWindow, 0, oBrowse:nBottom+1, oBrowse:nLeft, oBrowse:nRight-oBrowse:nLeft+1, /*aBlock*/ {|nWinNum, nXBid, nXBmsg, nXBpos| HXBscroller(oBrowse, nWinNum, nXBid, nXBmsg)}, /*aOffset*/ NIL) nVScrollBar := wvw_xbCreate( nCurWindow, 1, oBrowse:nTop, oBrowse:nRight+1, oBrowse:nBottom-oBrowse:nTop+1, /*aBlock*/ {|nWinNum, nXBid, nXBmsg, nXBpos| VXBscroller(oBrowse, nWinNum, nXBid, nXBmsg)}, /*aOffset*/ NIL) - DispOutAt( nTop + 1-nTop, nleft-nleft, padc( hb_CurDrive()+':\'+CurDir()+'\'+'test.dbf', nRight - nLeft + 1 ), 'W+/W' ) + hb_DispOutAt( nTop + 1-nTop, nleft-nleft, padc( hb_CurDrive()+':\'+CurDir()+'\'+'test.dbf', nRight - nLeft + 1 ), 'W+/W' ) oBrowse:ForceStable() RefreshHXB(oBrowse, nCurWindow, nHScrollBar) //20040704 diff --git a/harbour/tests/wvtext.prg b/harbour/tests/wvtext.prg index 4c40c062fc..b4af328bad 100644 --- a/harbour/tests/wvtext.prg +++ b/harbour/tests/wvtext.prg @@ -52,7 +52,7 @@ PROCEDURE Main() NEXT IF nMSec != NIL .AND. hb_milliSeconds() > nMSec + 2000 - DispOutAt( MaxRow(), 0, Space( MaxCol() + 1 ), "N/G*" ) + hb_DispOutAt( MaxRow(), 0, Space( MaxCol() + 1 ), "N/G*" ) nMSec := NIL ENDIF @@ -253,22 +253,22 @@ PROCEDURE Main() SetMode( MaxRow() + 2, MaxCol() + 2 ) ENDIF DispScreen() - DispOutAt( MaxRow(), 2, "< Font changed to " + hb_gtInfo( HB_GTI_FONTNAME ) + " >", "B/G*" ) + hb_DispOutAt( MaxRow(), 2, "< Font changed to " + hb_gtInfo( HB_GTI_FONTNAME ) + " >", "B/G*" ) nMSec := hb_milliSeconds() CASE nKey == HB_K_RESIZE DispScreen() - DispOutAt( MaxRow(), 33, "Resized ", "B/G*" ) + hb_DispOutAt( MaxRow(), 33, "Resized ", "B/G*" ) nMSec := hb_milliSeconds() CASE nKey == HB_K_GOTFOCUS ChgPalette( .T. ) - DispOutAt( MaxRow(), 33, "We got focus ", "B/G*" ) + hb_DispOutAt( MaxRow(), 33, "We got focus ", "B/G*" ) nMSec := hb_milliSeconds() CASE nKey == HB_K_LOSTFOCUS ChgPalette( .F. ) - DispOutAt( MaxRow(), 33, "We lost focus", "B/G*" ) + hb_DispOutAt( MaxRow(), 33, "We lost focus", "B/G*" ) nMSec := hb_milliSeconds() CASE nKey == HB_K_CLOSE @@ -293,36 +293,36 @@ STATIC PROCEDURE DispScreen() SetColor( "N/W" ) CLS - DispOutAt( 0, 0, PadC( "Harbour GT - New Features", nMaxCol ), "N/GR*" ) + hb_DispOutAt( 0, 0, PadC( "Harbour GT - New Features", nMaxCol ), "N/GR*" ) // Contributed by Massimo Belgrano - DispOutAt( 2, 0, PadC( "______ __ ______________________ ", nMaxCol ), "W+/W" ) - DispOutAt( 3, 0, PadC( "___ / / /_____ ___________ /___________ _________ __ ____/____/", nMaxCol ), "W+/W" ) - DispOutAt( 4, 0, PadC( "__ /_/ /_ __ `/_ ___/_ __ \ __ \ / / /_ ___/ _ / __ __/ ", nMaxCol ), "W+/W" ) - DispOutAt( 5, 0, PadC( "_ __ / / /_/ /_ / _ /_/ / /_/ / /_/ /_ / / /_/ / _ / ", nMaxCol ), "W+/W" ) - DispOutAt( 6, 0, PadC( "/_/ /_/ \__,_/ /_/ /_.___/\____/\__,_/ /_/ \____/ /_/ ", nMaxCol ), "W+/W" ) + hb_DispOutAt( 2, 0, PadC( "______ __ ______________________ ", nMaxCol ), "W+/W" ) + hb_DispOutAt( 3, 0, PadC( "___ / / /_____ ___________ /___________ _________ __ ____/____/", nMaxCol ), "W+/W" ) + hb_DispOutAt( 4, 0, PadC( "__ /_/ /_ __ `/_ ___/_ __ \ __ \ / / /_ ___/ _ / __ __/ ", nMaxCol ), "W+/W" ) + hb_DispOutAt( 5, 0, PadC( "_ __ / / /_/ /_ / _ /_/ / /_/ / /_/ /_ / / /_/ / _ / ", nMaxCol ), "W+/W" ) + hb_DispOutAt( 6, 0, PadC( "/_/ /_/ \__,_/ /_/ /_.___/\____/\__,_/ /_/ \____/ /_/ ", nMaxCol ), "W+/W" ) - DispOutAt( 8, 0, PadC( "MODE: " + hb_ntos( MaxRow() + 1 ) + " Rows and " + hb_ntos( nMaxCol ) + " Columns", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F2 MarkCopy Toggle > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F3 Resizable Toggle > " + iif( hb_gtInfo( HB_GTI_RESIZABLE ), "ON ", "Off" ), nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F4 Closable Toggle > " + iif( hb_gtInfo( HB_GTI_CLOSABLE ), "ON ", "Off" ), nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F5 Palette L Repeat > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F6 Palette D Repeat > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F7 Palette By Index R > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F8 MarkCopy menu text > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< Click Other Window > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< Click X Button > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F9 Resize Mode Toggle > " + iif( hb_gtInfo( HB_GTI_RESIZEMODE ) == HB_GTI_RESIZEMODE_ROWS, "ROWS", "FONT" ), nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F10 Open New Window > ", nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F11 Alt-Enter Toggle > " + iif( hb_gtInfo( HB_GTI_ALTENTER ), "ON ", "Off" ), nMaxCol ), cColor ) - DispOutAt( ++nRow, 0, PadC( "< F12 Change Font Test > " + hb_gtInfo( HB_GTI_FONTNAME ) + " " + hb_ntos( hb_gtInfo( HB_GTI_FONTWIDTH ) ) + "x" + hb_ntos( hb_gtInfo( HB_GTI_FONTSIZE ) ), nMaxCol ), cColor ) + hb_DispOutAt( 8, 0, PadC( "MODE: " + hb_ntos( MaxRow() + 1 ) + " Rows and " + hb_ntos( nMaxCol ) + " Columns", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F2 MarkCopy Toggle > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F3 Resizable Toggle > " + iif( hb_gtInfo( HB_GTI_RESIZABLE ), "ON ", "Off" ), nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F4 Closable Toggle > " + iif( hb_gtInfo( HB_GTI_CLOSABLE ), "ON ", "Off" ), nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F5 Palette L Repeat > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F6 Palette D Repeat > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F7 Palette By Index R > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F8 MarkCopy menu text > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< Click Other Window > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< Click X Button > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F9 Resize Mode Toggle > " + iif( hb_gtInfo( HB_GTI_RESIZEMODE ) == HB_GTI_RESIZEMODE_ROWS, "ROWS", "FONT" ), nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F10 Open New Window > ", nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F11 Alt-Enter Toggle > " + iif( hb_gtInfo( HB_GTI_ALTENTER ), "ON ", "Off" ), nMaxCol ), cColor ) + hb_DispOutAt( ++nRow, 0, PadC( "< F12 Change Font Test > " + hb_gtInfo( HB_GTI_FONTNAME ) + " " + hb_ntos( hb_gtInfo( HB_GTI_FONTWIDTH ) ) + "x" + hb_ntos( hb_gtInfo( HB_GTI_FONTSIZE ) ), nMaxCol ), cColor ) - DispOutAt( MaxRow(), 0, Space( MaxCol() + 1 ), "N/G*" ) + hb_DispOutAt( MaxRow(), 0, Space( MaxCol() + 1 ), "N/G*" ) - DispOutAt( 0, 0 , "TL", "N/GR*" ) - DispOutAt( 0, MaxCol() - 1 , "TR", "N/GR*" ) - DispOutAt( MaxRow(), 0 , "BL", "N/G*" ) - DispOutAt( MaxRow(), MaxCol() - 1, "BR", "N/G*" ) + hb_DispOutAt( 0, 0 , "TL", "N/GR*" ) + hb_DispOutAt( 0, MaxCol() - 1 , "TR", "N/GR*" ) + hb_DispOutAt( MaxRow(), 0 , "BL", "N/G*" ) + hb_DispOutAt( MaxRow(), MaxCol() - 1, "BR", "N/G*" ) DispEnd() @@ -410,7 +410,7 @@ PROCEDURE thFunc() cTitle := "New Window with " + hb_ntos( MaxRow() ) + ; " Rows and " + hb_ntos( MaxCol() ) + " Columns" - dispOutAt( 0, 0, PadC( cTitle, MaxCol() + 1 ), "N/GR*" ) + hb_DispOutAt( 0, 0, PadC( cTitle, MaxCol() + 1 ), "N/GR*" ) hb_gtInfo( HB_GTI_SETPOS_XY, nZx, nZy ) //this does not work until something is displayed @@ -448,7 +448,7 @@ PROCEDURE thFunc() CASE nKey == HB_K_RESIZE cTitle := "New Window with " + hb_ntos( MaxRow() ) + ; " Rows and " + hb_ntos( MaxCol() ) + " Columns" - dispOutAt( 0, 0, PadC( cTitle, MaxCol() + 1 ), "N/GR*" ) + hb_DispOutAt( 0, 0, PadC( cTitle, MaxCol() + 1 ), "N/GR*" ) oBrowse:nBottom := MaxRow() oBrowse:nRight := MaxCol()