fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-10-17 09:20 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/gtwvg/*.prg
  * contrib/gtwvg/tests/*.prg
  * contrib/hbamf/tests/tstendin.prg
  * contrib/hbct/doc/en/dattime3.txt
  * contrib/hbct/tests/token2.prg
  * contrib/hbgd/tests/gdtestcl.prg
  * contrib/hbhttpd/core.prg
  * contrib/hbhttpd/tests/eshop.prg
  * contrib/hbmysql/tests/dbf2mysq.prg
  * contrib/rddads/tests/datad.prg
  * contrib/xhb/tedit.prg
  * extras/gtwvw/tests/*.prg
  * src/rdd/usrrdd/rdds/arrayrdd.prg
  * src/rdd/usrrdd/rdds/hscdx.prg
    * removed space after .f./.t.
This commit is contained in:
Viktor Szakats
2012-10-17 07:22:54 +00:00
parent 374c03c57a
commit e9b808ca71
29 changed files with 102 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -16,6 +16,23 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-17 09:20 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/gtwvg/*.prg
* contrib/gtwvg/tests/*.prg
* contrib/hbamf/tests/tstendin.prg
* contrib/hbct/doc/en/dattime3.txt
* contrib/hbct/tests/token2.prg
* contrib/hbgd/tests/gdtestcl.prg
* contrib/hbhttpd/core.prg
* contrib/hbhttpd/tests/eshop.prg
* contrib/hbmysql/tests/dbf2mysq.prg
* contrib/rddads/tests/datad.prg
* contrib/xhb/tedit.prg
* extras/gtwvw/tests/*.prg
* src/rdd/usrrdd/rdds/arrayrdd.prg
* src/rdd/usrrdd/rdds/hscdx.prg
* removed space after .f./.t.
2012-10-17 08:24 UTC+0200 Viktor Szakats (harbour syenar.net)
+ contrib/hbnf/doc/en/adapter.txt
+ contrib/hbnf/doc/en/default.txt

6
harbour/contrib/gtwvg/class.prg
View File

@@ -985,7 +985,7 @@ METHOD WvtObject:CreatePopup()
METHOD WvtObject:ShowPopup()
LOCAL lRet := .F. , nRet, n, aPos
LOCAL lRet := .F., nRet, n, aPos
IF ::hPopup != nil
aPos := Wvt_GetCursorPos()
@@ -3393,7 +3393,7 @@ METHOD wvtMenu:Destroy()
METHOD wvtMenu:AddItem( cCaption, bAction )
LOCAL lResult := .F. , aItem
LOCAL lResult := .F., aItem
IF !Empty( ::hMenu ) .AND. ( !Empty( cCaption ) .OR. !Empty( bAction ) )
IF HB_ISOBJECT( bAction )
@@ -3425,7 +3425,7 @@ METHOD wvtMenu:AddItem( cCaption, bAction )
METHOD wvtMenu:DelAllItems()
LOCAL lResult := .T. , nItems
LOCAL lResult := .T., nItems
nItems := ::NumItems()
DO WHILE nItems > 0 .AND. lResult

2
harbour/contrib/gtwvg/crt.prg
View File

@@ -329,7 +329,7 @@ METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
hb_gtInfo( HB_GTI_RESIZABLE, ::resizable )
hb_gtInfo( HB_GTI_PRESPARAMS, { ::exStyle, ::style, ::aPos[ 1 ], ::aPos[ 2 ], ;
::maxRow + 1, ::maxCol + 1, ::pGTp, .F. , lRowCol, HB_WNDTYPE_CRT } )
::maxRow + 1, ::maxCol + 1, ::pGTp, .F., lRowCol, HB_WNDTYPE_CRT } )
hb_gtInfo( HB_GTI_SETFONT, { ::fontName, ::fontHeight, ::fontWidth } )
IF HB_ISNUMERIC( ::icon )

2
harbour/contrib/gtwvg/dialog.prg
View File

@@ -134,7 +134,7 @@ METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
ENDIF
hb_gtInfo( HB_GTI_PRESPARAMS, { ::exStyle, ::style, ::aPos[ 1 ], ::aPos[ 2 ], ;
::aSize[ 1 ], ::aSize[ 2 ], ::pGTp, .F. , .F. , HB_WNDTYPE_DIALOG } )
::aSize[ 1 ], ::aSize[ 2 ], ::pGTp, .F., .F., HB_WNDTYPE_DIALOG } )
if ::visible
hb_gtInfo( HB_GTI_SPEC, HB_GTS_SHOWWINDOW, SW_NORMAL )

4
harbour/contrib/gtwvg/menubar.prg
View File

@@ -230,7 +230,7 @@ METHOD WvgMenuBar:destroy()
METHOD WvgMenuBar:delAllItems()
LOCAL lResult := .T. , nItems
LOCAL lResult := .T., nItems
nItems := ::numItems()
DO WHILE nItems > 0 .AND. lResult
@@ -426,7 +426,7 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck )
nRet := WVG_CheckMenuItem( ::hMenu, nItemNum - 1, MF_BYPOSITION + iif( lCheck, MF_CHECKED, MF_UNCHECKED ) )
ENDIF
RETURN iif( nRet == - 1, .F. , .T. )
RETURN iif( nRet == -1, .F., .T. )
//

2
harbour/contrib/gtwvg/paint.prg
View File

@@ -488,7 +488,7 @@ FUNCTION Wvt_DialogBox( acnDlg, cbDlgProc, hWndParent )
xTemplate := acnDlg
ENDIF
nResult := Wvt_CreateDialogModal( xTemplate, .F. , cbDlgProc, nDlgMode, hWndParent )
nResult := Wvt_CreateDialogModal( xTemplate, .F., cbDlgProc, nDlgMode, hWndParent )
Wvg_SetFocus( hWndParent )

2
harbour/contrib/gtwvg/tests/activex.prg
View File

@@ -207,7 +207,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam )
#if 0
oItem1:expand( .T. )
#else
oTree:showExpanded( .T. , 2 )
oTree:showExpanded( .T., 2 )
#endif
oTree:setData( oItem2 )

2
harbour/contrib/gtwvg/tests/demowvg.prg
View File

@@ -144,7 +144,7 @@ PROCEDURE Main()
AAdd( aBlocks, {|| Wvt_SetIcon( GetResource( "vr_1.ico" ) ) } )
AAdd( aBlocks, {|| Wvt_SetTitle( "Vouch" ) } )
AAdd( aBlocks, {|| Wvt_DrawLabel( 1,40, cLabel,6,, rgb(255,255,255 ), rgb(198,198,198 ), "Arial", 26, , , , , .T. , .T. ) } )
AAdd( aBlocks, {|| Wvt_DrawLabel( 1,40, cLabel,6,, rgb(255,255,255 ), rgb(198,198,198 ), "Arial", 26, , , , , .T., .T. ) } )
AAdd( aBlocks, {|| Wvt_DrawBoxRaised( nTop, nLft, nBtm, nRgt ) } )
AAdd( aBlocks, {|| Wvt_DrawBoxRecessed( 7, 61, 13, 70 ) } )
AAdd( aBlocks, {|| Wvt_DrawBoxGroup( 15, 59, 18, 72 ) } )

2
harbour/contrib/gtwvg/tests/demowvg1.prg
View File

@@ -52,7 +52,7 @@ PROCEDURE Main()
aPaint := {}
AAdd( aPaint, { "Label" , {|| Wvt_DrawLabel( 1, 40, "Harbour Console GUI Demo", 6, , rgb( 255,255,255 ), rgb( 198,198,198 ), "Arial", 26, , , , , .T. , .T. ) } , { WVT_BLOCK_LABEL, 1, 10, 3, 50 } } )
AAdd( aPaint, { "Label" , {|| Wvt_DrawLabel( 1, 40, "Harbour Console GUI Demo", 6, , rgb( 255,255,255 ), rgb( 198,198,198 ), "Arial", 26, , , , , .T., .T. ) } , { WVT_BLOCK_LABEL, 1, 10, 3, 50 } } )
AAdd( aPaint, { "Box_1" , {|| Wvt_DrawBoxRaised( 4, 4, 20, 75 ) } , { WVT_BLOCK_BOX , 4, 4, 20, 75 } } )
AAdd( aPaint, { "Box_2" , {|| Wvt_DrawBoxRecessed( 7, 61, 13, 70 ) } , { WVT_BLOCK_BOX , 7, 61, 13, 70 } } )
AAdd( aPaint, { "Box_3" , {|| Wvt_DrawBoxGroup( 15, 59, 18, 72 ) } , { WVT_BLOCK_BOX , 15, 59, 18, 72 } } )

2
harbour/contrib/gtwvg/tests/demoxbp.prg
View File

@@ -138,7 +138,7 @@ PROCEDURE Main()
#if 0
oItem1:expand( .T. )
#else
oTree:showExpanded( .T. , 2 )
oTree:showExpanded( .T., 2 )
#endif
oTree:setData( oItem2 )

2
harbour/contrib/gtwvg/tests/dyndlgs.prg
View File

@@ -318,7 +318,7 @@ FUNCTION DlgSlideShow()
aDlg := Wvt_MakeDlgTemplate( 0, 0, 20, 40, {}, "Slide Show", nStyle )
hDlg := Wvt_CreateDialog( aDlg, .F. , "DlgSlideShowProc", "vr_1.ico", 5000 )
hDlg := Wvt_CreateDialog( aDlg, .F., "DlgSlideShowProc", "vr_1.ico", 5000 )
RETURN hDlg

2
harbour/contrib/gtwvg/tests/tbrowser.prg
View File

@@ -328,7 +328,7 @@ STATIC FUNCTION BrwBuildTree( oCrt /*, oBrw*/ )
oItem2:addItem( "Third level y" )
oItem2:addItem( "Third level z" )
oTree:showExpanded( .T. , 2 )
oTree:showExpanded( .T., 2 )
oTree:setData( oItem2 )
oTree:tooltipText := "Treeview embedded onto CUI window"

2
harbour/contrib/gtwvg/tests/wvtcls.prg
View File

@@ -261,7 +261,7 @@ STATIC FUNCTION MyDialogOne( oCrt )
aGets_ := { PadR( "Pritpal", 20 ), PadR( "Bedi", 20 ), PadR( "60, New Professor Colony", 30 ), ;
PadR( "Ludhiana, INDIA", 30 ), ;
"PB", PadR( "141004", 10 ), SToD( "20040622" ), .T. , 48, 17000, ;
"PB", PadR( "141004", 10 ), SToD( "20040622" ), .T., 48, 17000, ;
PadR( "Wvtgui is a classical example of Harbour capabilities...", 65 ) }
oGet1 := WvtGets():New( oDlg, , 4, 2, 37, 62 )

2
harbour/contrib/gtwvg/tests/xbp.prg
View File

@@ -136,7 +136,7 @@ FUNCTION demoxbp()
#if 0
oItem1:expand( .T. )
#else
oTree:showExpanded( .T. , 2 )
oTree:showExpanded( .T., 2 )
#endif
oTree:setData( oItem2 )

6
harbour/contrib/gtwvg/toolbar.prg
View File

@@ -317,14 +317,14 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
"\" $ xImage .OR. ;
":" $ xImage .OR. ;
hb_FileExists( xImage )
pBitmap := Wvg_PrepareBitmapFromFile( xImage, ::imageWidth, ::imageHeight, .T. , ::hWnd )
pBitmap := Wvg_PrepareBitmapFromFile( xImage, ::imageWidth, ::imageHeight, .T., ::hWnd )
ELSE
pBitmap := Wvg_PrepareBitmapFromResourceName( xImage, ::imageWidth, ::imageHeight, .T. , ::hWnd )
pBitmap := Wvg_PrepareBitmapFromResourceName( xImage, ::imageWidth, ::imageHeight, .T., ::hWnd )
ENDIF
EXIT
CASE "N"
pBitmap := Wvg_PrepareBitmapFromResourceID( xImage, ::imageWidth, ::imageHeight, .T. , ::hWnd )
pBitmap := Wvg_PrepareBitmapFromResourceID( xImage, ::imageWidth, ::imageHeight, .T., ::hWnd )
EXIT
CASE "P"

2
harbour/contrib/gtwvg/treeview.prg
View File

@@ -118,7 +118,7 @@ CREATE CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef
METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 1 ), nRGB ) )
METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB )
METHOD showExpanded( lExpanded, nLevels ) INLINE Wvg_TreeView_ShowExpanded( ::hWnd, ;
iif( HB_ISNIL( lExpanded ), .F. , lExpanded ), nLevels )
iif( HB_ISNIL( lExpanded ), .F., lExpanded ), nLevels )
ENDCLASS

4
harbour/contrib/hbamf/tests/tstendin.prg
View File

@@ -29,8 +29,8 @@ PROCEDURE Main()
TEST 9007199254740991.00, "8918"
TEST 6969.69, "10AF"
TEST NIL, "F1E1"
TEST .T. , "E3C2"
TEST .F. , "6AD3"
TEST .T., "E3C2"
TEST .F., "6AD3"
TEST { 1, -1 }, "0560"
TEST { "ONE" => 0xcafe, "TWO" => 0xbabe }, "CE93"

2
harbour/contrib/hbct/doc/en/dattime3.txt
View File

@@ -16,7 +16,7 @@
* 1/100ths of seconds. Values from 1 to 8, 640, 000 (one day) are
* possible.
* $RETURNS$
* WAITPERIOD() returns .T. , if the time span designated at initialization
* WAITPERIOD() returns .T., if the time span designated at initialization
* has not elapsed.
* $DESCRIPTION$
* This function sets a time span for a xHarbour DO WHILE loop to run.

6
harbour/contrib/hbct/tests/token2.prg
View File

@@ -122,8 +122,8 @@ PROCEDURE Main()
ENDDO
?
? [ access tokens directly with tokenat]
? [ tokenat(.F.,2) == 3 ? ---------------> ] + Str( tokenat( .F. ,2 ) )
? [ tokenat(.T.,4) == 14 ? --------------> ] + Str( tokenat( .T. ,4 ) )
? [ tokenat(.F.,2) == 3 ? ---------------> ] + Str( tokenat( .F., 2 ) )
? [ tokenat(.T.,4) == 14 ? --------------> ] + Str( tokenat( .T., 4 ) )
?
? "...Press any key..."
@@ -133,7 +133,7 @@ PROCEDURE Main()
? [ Save global token environment with savetoken]
cTE1 := savetoken()
? [ tokeninit a different string, cStr4 := "] + cStr4 + [", with tokeninit()]
? [ tokeninit(@cStr4, ":", 1) == .T. ? ----> ] + ltoc( tokeninit(@cStr4, ":", 1 ) )
? [ tokeninit(@cStr4, ":", 1) == .T. ? ----> ] + ltoc( tokeninit( @cStr4, ":", 1 ) )
? [ tokennum() == 5 ? ---------------------> ] + Str( tokennum() )
? [ tokennext() == "08" ? ------------------> "] + tokennext( @cStr4 ) + ["]
? [ Now restore global token environment with resttoken and rewind it]

16
harbour/contrib/hbgd/tests/gdtestcl.prg
View File

@@ -225,11 +225,11 @@ PROCEDURE Main()
oI5:AddDef( "FONTPITCH", "GIANT" )
oI5:SetData( { ;
{ "LABEL" => "One" , "VALUE" => 10, "COLOR" => blue , "FILLED" => .T. , "EXTRUDE" => 40/*, "TILE" => oB*/ }, ;
{ "LABEL" => "Two" , "VALUE" => 35, "COLOR" => gray , "FILLED" => .T. , "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } }, ;
{ "LABEL" => "One" , "VALUE" => 10, "COLOR" => blue , "FILLED" => .T., "EXTRUDE" => 40/*, "TILE" => oB*/ }, ;
{ "LABEL" => "Two" , "VALUE" => 35, "COLOR" => gray , "FILLED" => .T., "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } }, ;
{ "LABEL" => "Three", "VALUE" => 55, "COLOR" => green, "FILLED" => .T. }, ;
{ "LABEL" => "Four" , "VALUE" => 55, "FILLED" => .T. , "TILE" => oB }, ;
{ "LABEL" => "Five" , "VALUE" => 55, "COLOR" => red , "FILLED" => .T. , "EXTRUDE" => 20 }, ;
{ "LABEL" => "Five" , "VALUE" => 55, "COLOR" => red , "FILLED" => .T., "EXTRUDE" => 20 }, ;
{ "LABEL" => "Six" , "VALUE" => 55, "FILLED" => .T. , "TILE" => oB }, ;
{ "LABEL" => "Seven", "VALUE" => 55, "FILLED" => .T. , "COLOR" => green } ;
} )
@@ -276,13 +276,13 @@ PROCEDURE Main()
oI5:SetData( { ;
{ "LABEL" => "One", "VALUE" => 10, "COLOR" => blue, "FILLED" => .T. , "EXTRUDE" => 40/*, "TILE" => oB*/ }, ;
{ "LABEL" => "Two", "VALUE" => 35, "COLOR" => gray, "FILLED" => .T. , "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } }, ;
{ "LABEL" => "One", "VALUE" => 10, "COLOR" => blue, "FILLED" => .T., "EXTRUDE" => 40/*, "TILE" => oB*/ }, ;
{ "LABEL" => "Two", "VALUE" => 35, "COLOR" => gray, "FILLED" => .T., "FONT" => { "NAME" => "Verdana", "PITCH" => 12, "ANGLE" => 0, "COLOR" => red } }, ;
{ "LABEL" => "Three", "VALUE" => 55, "COLOR" => green, "FILLED" => .T. }, ;
{ "LABEL" => "Four", "VALUE" => 65, "FILLED" => .T. , "TILE" => oB }, ;
{ "LABEL" => "Five", "VALUE" => 34, "FILLED" => .T. , "COLOR" => green }, ;
{ "LABEL" => "Four", "VALUE" => 65, "FILLED" => .T., "TILE" => oB }, ;
{ "LABEL" => "Five", "VALUE" => 34, "FILLED" => .T., "COLOR" => green }, ;
{ "LABEL" => "Six", "VALUE" => 100 }, ;
{ "LABEL" => "Seven", "VALUE" => 0, "FILLED" => .T. , "COLOR" => red }, ;
{ "LABEL" => "Seven", "VALUE" => 0, "FILLED" => .T., "COLOR" => red }, ;
{ "LABEL" => "Eight", "VALUE" => - 0 }, ;
{ "LABEL" => "Nine", "VALUE" => - 0, "COLOR" => blue, "FILLED" => .T. } ;
} )

10
harbour/contrib/hbhttpd/core.prg
View File

@@ -74,7 +74,7 @@ METHOD RUN( hConfig ) CLASS UHttpd
ENDIF
Self:hConfig := {;
"SSL" => .F. , ;
"SSL" => .F., ;
"Port" => 80, ;
"BindAddress" => "0.0.0.0", ;
"LogAccess" => {|| NIL }, ;
@@ -1461,17 +1461,17 @@ PROCEDURE UProcFiles( cFileName, lIndex )
IF HB_HHasKey( get, "s" )
IF get["s"] == "s"
ASort( aDir, , , {| X, Y | iif( X[5] == "D", iif(Y[5] == "D", X[1] < Y[1], .T. ), ;
iif( Y[5] == "D", .F. , X[2] < Y[2] ) ) } )
iif( Y[5] == "D", .F., X[2] < Y[2] ) ) } )
ELSEIF get["s"] == "m"
ASort( aDir, , , {| X, Y | iif( X[5] == "D", iif(Y[5] == "D", X[1] < Y[1], .T. ), ;
iif( Y[5] == "D", .F. , DToS( X[3] ) + X[4] < DToS( Y[3] ) + Y[4] ) ) } )
iif( Y[5] == "D", .F., DToS( X[3] ) + X[4] < DToS( Y[3] ) + Y[4] ) ) } )
ELSE
ASort( aDir, , , {| X, Y | iif( X[5] == "D", iif(Y[5] == "D", X[1] < Y[1], .T. ), ;
iif( Y[5] == "D", .F. , X[1] < Y[1] ) ) } )
iif( Y[5] == "D", .F., X[1] < Y[1] ) ) } )
ENDIF
ELSE
ASort( aDir, , , {| X, Y | iif( X[5] == "D", iif(Y[5] == "D", X[1] < Y[1], .T. ), ;
iif( Y[5] == "D", .F. , X[1] < Y[1] ) ) } )
iif( Y[5] == "D", .F., X[1] < Y[1] ) ) } )
ENDIF
UWrite( '<html><body><h1>Index of ' + server["SCRIPT_NAME"] + '</h1><pre> ' )

30
harbour/contrib/hbhttpd/tests/eshop.prg
View File

@@ -43,7 +43,7 @@ PROCEDURE Main()
IF ! HB_FILEEXISTS( "users.dbf" )
FErase( "users.cdx" )
dbCreate( "users", { { "USER", "C", 16, 0 }, { "PASSWORD", "C", 16, 0 }, { "NAME", "C", 50, 0 } }, , .T. , "user" )
dbCreate( "users", { { "USER", "C", 16, 0 }, { "PASSWORD", "C", 16, 0 }, { "NAME", "C", 50, 0 } }, , .T., "user" )
dbAppend()
FIELD->USER := "demo"
FIELD->PASSWORD := "demo"
@@ -51,29 +51,29 @@ PROCEDURE Main()
OrdCreate( "users", "user", "USER" )
dbCloseArea()
ELSEIF ! HB_FILEEXISTS( "users.cdx" )
dbUseArea( .T. , , "users", , .F. , .F. )
dbUseArea( .T., , "users", , .F., .F. )
OrdCreate( "users", "user", "USER" )
dbCloseArea()
ENDIF
IF ! HB_FILEEXISTS( "carts.dbf" )
FErase( "carts.cdx" )
dbCreate( "carts", { { "USER", "C", 16, 0 }, { "CODE", "C", 16, 0 }, { "AMOUNT", "N", 6, 0 }, { "TOTAL", "N", 9, 2 } }, , .T. , "cart" )
dbCreate( "carts", { { "USER", "C", 16, 0 }, { "CODE", "C", 16, 0 }, { "AMOUNT", "N", 6, 0 }, { "TOTAL", "N", 9, 2 } }, , .T., "cart" )
OrdCreate( "carts", "user", "USER+CODE" )
dbCloseArea()
ELSEIF ! HB_FILEEXISTS( "carts.cdx" )
dbUseArea( .T. , , "carts", , .F. , .F. )
dbUseArea( .T., , "carts", , .F., .F. )
OrdCreate( "carts", "user", "USER+CODE" )
dbCloseArea()
ENDIF
IF ! HB_FILEEXISTS( "items.dbf" )
FErase( "items.cdx" )
dbCreate( "items", { { "CODE", "C", 16, 0 }, { "TITLE", "C", 80, 0 }, { "PRICE", "N", 9, 2 } }, , .T. , "items" )
dbCreate( "items", { { "CODE", "C", 16, 0 }, { "TITLE", "C", 80, 0 }, { "PRICE", "N", 9, 2 } }, , .T., "items" )
OrdCreate( "items", "code", "CODE" )
dbCloseArea()
ELSEIF ! HB_FILEEXISTS( "item.cdx" )
dbUseArea( .T. , , "items", , .F. , .F. )
dbUseArea( .T., , "items", , .F., .F. )
OrdCreate( "items", "code", "CODE" )
dbCloseArea()
ENDIF
@@ -108,7 +108,7 @@ PROCEDURE Main()
"Idle" => {| o | iif( HB_FILEEXISTS( ".uhttpd.stop" ), ( FErase(".uhttpd.stop" ), o:Stop() ), NIL ) }, ;
"PrivateKeyFilename" => "private.key", ;
"CertificateFilename" => "certificate.crt", ;
"SSL" => .T. , ;
"SSL" => .T., ;
"Mount" => {;
"/hello" => {|| UWrite( "Hello!" ) }, ;
"/info" => {|| UProcInfo() }, ;
@@ -139,7 +139,7 @@ STATIC FUNCTION proc_login()
LOCAL cUser
IF server["REQUEST_METHOD"] == "POST"
dbUseArea( .T. , , "users", "users", .T. , .T. )
dbUseArea( .T., , "users", "users", .T., .T. )
OrdSetFocus( "user" )
cUser := PadR( HB_HGetDef( post, "user", "" ), 16 )
USessionStart()
@@ -188,9 +188,9 @@ STATIC FUNCTION proc_shopping()
RETURN NIL
ENDIF
dbUseArea( .T. , , "carts", "carts", .T. , .F. )
dbUseArea( .T., , "carts", "carts", .T., .F. )
OrdSetFocus( "user" )
dbUseArea( .T. , , "items", "items", .T. , .T. )
dbUseArea( .T., , "items", "items", .T., .T. )
OrdSetFocus( "code" )
IF HB_HHasKey( get, "add" )
@@ -237,9 +237,9 @@ STATIC FUNCTION proc_cart()
RETURN NIL
ENDIF
dbUseArea( .T. , , "items", "items", .T. , .T. )
dbUseArea( .T., , "items", "items", .T., .T. )
OrdSetFocus( "code" )
dbUseArea( .T. , , "carts", "carts", .T. , .F. )
dbUseArea( .T., , "carts", "carts", .T., .F. )
OrdSetFocus( "user" )
IF HB_HHasKey( get, "del" )
@@ -281,7 +281,7 @@ STATIC FUNCTION proc_account()
URedirect( "/app/login" )
RETURN NIL
ENDIF
dbUseArea( .T. , , "users", "users", .T. , .F. )
dbUseArea( .T., , "users", "users", .T., .F. )
OrdSetFocus( "user" )
dbSeek( session["user"], .F. )
@@ -296,7 +296,7 @@ STATIC FUNCTION proc_account_edit()
URedirect( "/app/login" )
RETURN NIL
ENDIF
dbUseArea( .T. , , "users", "users", .T. , .F. )
dbUseArea( .T., , "users", "users", .T., .F. )
OrdSetFocus( "user" )
dbSeek( session["user"], .F. )
@@ -352,7 +352,7 @@ STATIC FUNCTION proc_register()
cName := session["formdata_register", "name"]
ENDIF
IF server["REQUEST_METHOD"] == "POST"
dbUseArea( .T. , , "users", "users", .T. , .F. )
dbUseArea( .T., , "users", "users", .T., .F. )
OrdSetFocus( "user" )
cUser := HB_HGetDef( post, "user", "" )
cName := HB_HGetDef( post, "name", "" )

2
harbour/contrib/hbmysql/tests/dbf2mysq.prg
View File

@@ -108,7 +108,7 @@ PROCEDURE Main( ... )
ENDCASE
ENDDO
dbUseArea( .T. , , cFile, "dbffile", , .T. )
dbUseArea( .T., , cFile, "dbffile", , .T. )
aDbfStruct := dbffile->( dbStruct() )
oServer := TMySQLServer():New( cHostName, cUser, cPassWord )

2
harbour/contrib/rddads/tests/datad.prg
View File

@@ -142,7 +142,7 @@ PROCEDURE Main()
// AdsUseDictionary( .T. ) this function no longer is needed; the system knows if it's using a Data Dictionary connection
// Open the "long table name" for Table2
dbUseArea( .T., , "Customer Data", "custom", .T. , .F. )
dbUseArea( .T., , "Customer Data", "custom", .T., .F. )
? "Press a key to browse", Alias()
Inkey( 0 )
Browse()

4
harbour/contrib/xhb/tedit.prg
View File

@@ -353,9 +353,9 @@ METHOD Put() CLASS THtmlControl
" value=" + ::aOptions[ i, _OPTION_VALUE ], "" )
cStr += iif( ::aOptions[ i, _OPTION_LABEL ] != NIL, ;
" label=" + ::aOptions[ i, _OPTION_LABEL ], "" )
cStr += iif( ::aOptions[ i, _OPTION_SELECTED ] == .T. , ;
cStr += iif( ::aOptions[ i, _OPTION_SELECTED ] == .T., ;
" SELECTED ", "" )
cStr += iif( ::aOptions[ i, _OPTION_DISABLED ] == .T. , ;
cStr += iif( ::aOptions[ i, _OPTION_DISABLED ] == .T., ;
" DISABLED ", "" )
cStr += ">" + ::aOptions[ i, _OPTION_TEXT ] + "</OPTION>" + CRLF()
// FWrite( ::nH, cStr )

4
harbour/extras/gtwvw/tests/wvwmouse.prg
View File

@@ -352,7 +352,7 @@ METHOD DRAW( nWinNum ) CLASS WVWMouseButton
ENDIF
IF ! Empty( ::cCaption )
Wvw_DrawLabel( nWinNum, ::nRow1, nCeiling( ( ::nCol2 + ::nCol1 ) / 2 ), ::cCaption, 6, , nLabelColor, rgb( 198,198,198 ), ::cCaptionFont, iif( HB_ISARRAY( afontinfo ), afontinfo[ 2 ], ::nCaptionHeight ), 0, , , , .F. , .F. )
Wvw_DrawLabel( nWinNum, ::nRow1, nCeiling( ( ::nCol2 + ::nCol1 ) / 2 ), ::cCaption, 6, , nLabelColor, rgb( 198,198,198 ), ::cCaptionFont, iif( HB_ISARRAY( afontinfo ), afontinfo[ 2 ], ::nCaptionHeight ), 0, , , , .F., .F. )
ENDIF
ELSE
IF lMouseOver .OR. ::nType == _BUTTON_NORMAL .OR. ::nType == _BUTTON_HARD
@@ -376,7 +376,7 @@ METHOD DRAW( nWinNum ) CLASS WVWMouseButton
ENDIF
IF ! Empty( ::cCaption )
Wvw_DrawLabel( nWinNum, ::nRow1, nCeiling( ( ::nCol2 + ::nCol1 ) / 2 ), ::cCaption, 6, , nLabelColor, rgb( 198,198,198 ), ::cCaptionFont, iif( HB_ISARRAY( afontinfo ), afontinfo[ 2 ], ::nCaptionHeight ), 0, , , , .F. , .F. )
Wvw_DrawLabel( nWinNum, ::nRow1, nCeiling( ( ::nCol2 + ::nCol1 ) / 2 ), ::cCaption, 6, , nLabelColor, rgb( 198,198,198 ), ::cCaptionFont, iif( HB_ISARRAY( afontinfo ), afontinfo[ 2 ], ::nCaptionHeight ), 0, , , , .F., .F. )
ENDIF
ENDIF
SetCursor( nOldCursor )

4
harbour/extras/gtwvw/tests/wvwtest9.prg
View File

@@ -250,7 +250,7 @@ PROCEDURE Main()
CreateToolbar( nCurWindow )
ResetMiscObjects( nCurWindow )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1, 40, cLabel, 6,, rgb( 255, 255, 255 ), rgb( 198, 198, 198 ), "Arial", s_afontinfo[ 2 ], , , , , .T. , .T. ) } )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1, 40, cLabel, 6,, rgb( 255, 255, 255 ), rgb( 198, 198, 198 ), "Arial", s_afontinfo[ 2 ], , , , , .T., .T. ) } )
wvwm_ResetMouseObjects( nCurWindow )
wvwm_AddMouseObjects( nCurWindow, WVWMouseButton():New( "Info!", MaxRow() - 2, 67, , , {|| xDebugInfo() } ) )
@@ -457,7 +457,7 @@ PROCEDURE Demo_Get()
WVW_SetIcon( , "vr_1.ico" )
ResetMiscObjects( nCurWindow )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1,nRight - nLeft, cLabel,2,, rgb( 255, 255, 255 ), rgb( 198, 198, 198 ), "Arial", s_afontinfo[ 2 ], , , , , .T. , .T. ) } )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1,nRight - nLeft, cLabel,2,, rgb( 255, 255, 255 ), rgb( 198, 198, 198 ), "Arial", s_afontinfo[ 2 ], , , , , .T., .T. ) } )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxRecessed( nWindow, 7 - nTop, 61 - nLeft, 13 - nTop, 70 - nLeft ) } )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxGroup( nWindow, 15 - nTop, 59 - nLeft, 18 - nTop, 72 - nLeft ) } )
AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxGroup( nWindow, 5 - nTop, 6 - nLeft, 19 - nTop, 44 - nLeft ) } )

44
harbour/src/rdd/usrrdd/rdds/arrayrdd.prg
View File

@@ -1172,28 +1172,28 @@ STATIC FUNCTION AR_ORDCREATE( nWA, aOrderCreate )
ELSE
aOCInfo := aOrderCreate[ UR_ORCR_CONDINFO ] := ;
{ ;
.F. ,; /* #define UR_ORC_ACTIVE 1 */
"" ,; /* #define UR_ORC_CFOR 2 */
"" ,; /* #define UR_ORC_CWHILE 3 */
NIL ,; /* #define UR_ORC_BFOR 4 */
NIL ,; /* #define UR_ORC_BWHILE 5 */
NIL ,; /* #define UR_ORC_BEVAL 6 */
0 ,; /* #define UR_ORC_STEP 7 */
0 ,; /* #define UR_ORC_STARTREC 8 */
0 ,; /* #define UR_ORC_NEXT 9 */
0 ,; /* #define UR_ORC_RECORD 10 */
.F. ,; /* #define UR_ORC_REST 11 */
.F. ,; /* #define UR_ORC_DESCEND 12 */
.F. ,; /* #define UR_ORC_SCOPED 13 */
.T. ,; /* #define UR_ORC_ALL 14 */
.F. ,; /* #define UR_ORC_ADDITIVE 15 */
.F. ,; /* #define UR_ORC_USECURRENT 16 */
.F. ,; /* #define UR_ORC_CUSTOM 17 */
.F. ,; /* #define UR_ORC_NOOPTIMIZE 18 */
.F. ,; /* #define UR_ORC_COMPOUND 19 */
.F. ,; /* #define UR_ORC_USEFILTER 20 */
.F. ,; /* #define UR_ORC_TEMPORARY 21 */
.F. ,; /* #define UR_ORC_EXCLUSIVE 22 */
.F., ; /* #define UR_ORC_ACTIVE 1 */
"" , ; /* #define UR_ORC_CFOR 2 */
"" , ; /* #define UR_ORC_CWHILE 3 */
NIL, ; /* #define UR_ORC_BFOR 4 */
NIL, ; /* #define UR_ORC_BWHILE 5 */
NIL, ; /* #define UR_ORC_BEVAL 6 */
0 , ; /* #define UR_ORC_STEP 7 */
0 , ; /* #define UR_ORC_STARTREC 8 */
0 , ; /* #define UR_ORC_NEXT 9 */
0 , ; /* #define UR_ORC_RECORD 10 */
.F., ; /* #define UR_ORC_REST 11 */
.F., ; /* #define UR_ORC_DESCEND 12 */
.F., ; /* #define UR_ORC_SCOPED 13 */
.T., ; /* #define UR_ORC_ALL 14 */
.F., ; /* #define UR_ORC_ADDITIVE 15 */
.F., ; /* #define UR_ORC_USECURRENT 16 */
.F., ; /* #define UR_ORC_CUSTOM 17 */
.F., ; /* #define UR_ORC_NOOPTIMIZE 18 */
.F., ; /* #define UR_ORC_COMPOUND 19 */
.F., ; /* #define UR_ORC_USEFILTER 20 */
.F., ; /* #define UR_ORC_TEMPORARY 21 */
.F., ; /* #define UR_ORC_EXCLUSIVE 22 */
NIL ; /* #define UR_ORC_CARGO 23 */
}
ENDIF

2
harbour/src/rdd/usrrdd/rdds/hscdx.prg
View File

@@ -75,7 +75,7 @@ ANNOUNCE HSCDX
STATIC FUNCTION _HSX_NEW( pWA )
LOCAL aWData := { .F. , {}, {} }
LOCAL aWData := { .F., {}, {} }
/*
* Set in our private AREA item the array where we will kepp HSX indexes