diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1b071a76e4..b4d7581b8f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,151 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-03 17:29 UTC+0200 Viktor Szakats (harbour syenar.net) + * config/postinst.hb + * utils/hbmk2/hbmk2.prg + + using HB_CWD() instead of DIRCHANGE() + + - tests/speedold.prg + * contrib/gtwvg/3state.prg + * contrib/gtwvg/activex.prg + * contrib/gtwvg/bitmap.prg + * contrib/gtwvg/checkbox.prg + * contrib/gtwvg/class.prg + * contrib/gtwvg/combobox.prg + * contrib/gtwvg/crt.prg + * contrib/gtwvg/dataref.prg + * contrib/gtwvg/dialog.prg + * contrib/gtwvg/drawarea.prg + * contrib/gtwvg/genrc.prg + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/htmlview.prg + * contrib/gtwvg/listbox.prg + * contrib/gtwvg/menubar.prg + * contrib/gtwvg/mle.prg + * contrib/gtwvg/paint.prg + * contrib/gtwvg/parthdlr.prg + * contrib/gtwvg/pushbut.prg + * contrib/gtwvg/radiobut.prg + * contrib/gtwvg/scrollbr.prg + * contrib/gtwvg/sle.prg + * contrib/gtwvg/statbar.prg + * contrib/gtwvg/static.prg + * contrib/gtwvg/syswnd.prg + * contrib/gtwvg/tabpage.prg + * contrib/gtwvg/tests/activex.prg + * contrib/gtwvg/tests/cuigdlgs.prg + * contrib/gtwvg/tests/demowvg.prg + * contrib/gtwvg/tests/demowvg1.prg + * contrib/gtwvg/tests/demoxbp.prg + * contrib/gtwvg/tests/dyndlgs.prg + * contrib/gtwvg/tests/modal.prg + * contrib/gtwvg/tests/tbrowser.prg + * contrib/gtwvg/tests/utils.prg + * contrib/gtwvg/tests/wvtcls.prg + * contrib/gtwvg/tests/xbp.prg + * contrib/gtwvg/toolbar.prg + * contrib/gtwvg/treeview.prg + * contrib/gtwvg/wnd.prg + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgcuig.c + * contrib/gtwvg/wvtwin.ch + * contrib/hbct/getinfo.prg + * contrib/hbhttpd/readme.txt + * contrib/hbhttpd/widgets.prg + * contrib/hbmzip/tests/myunzip.prg + * contrib/hbmzip/tests/myzip.prg + * contrib/hbnetio/tests/netiot02.prg + * contrib/hbnf/hex2dec.prg + * contrib/hbsqlit3/tests/backup.prg + * contrib/hbwin/tests/pdfcreat.prg + * contrib/hbwin/tests/testole.prg + * contrib/rddsql/tests/arrayrdd.prg + * contrib/xhb/cstruct.prg + * contrib/xhb/dumpvar.prg + * contrib/xhb/trpc.prg + * contrib/xhb/ttable.ch + * contrib/xhb/txml.prg + * contrib/xhb/xcstr.prg + * contrib/xhb/xdbmodst.prg + * ChangeLog + * doc/en/command.txt + * doc/en/hvm.txt + * doc/en/menu.txt + * doc/en/tbrowse.txt + * extras/gtwvw/gtwvw.c + * extras/gtwvw/hbgtwvw.h + * extras/gtwvw/tests/cbtest1.prg + * extras/gtwvw/tests/cbtest6.prg + * extras/gtwvw/tests/drawimg.prg + * extras/gtwvw/tests/ebtest7.prg + * extras/gtwvw/tests/inpfocus.prg + * extras/gtwvw/tests/prog0.prg + * extras/gtwvw/tests/prog1.prg + * extras/gtwvw/tests/prog2.prg + * extras/gtwvw/tests/wvwmouse.prg + * extras/gtwvw/tests/wvwtest9.prg + * extras/gtwvw/wvwcheck.c + * extras/gtwvw/wvwdraw.c + * extras/gtwvw/wvwfuncs.c + * extras/gtwvw/wvwmenu.c + * extras/gtwvw/wvwpush.c + * extras/gtwvw/wvwstbar.c + * extras/gtwvw/wvwtbar.c + * extras/hbvpdf/hbvpdf.prg + * extras/hbvpdf/hbvpdft.prg + * extras/hbxlsxml/tests/example.prg + * extras/hbxlsxml/tests/example2.prg + * extras/hbxlsxml/tests/example3.prg + * extras/hbxlsxml/xlsxml_s.prg + * extras/hbxlsxml/xlsxml_y.prg + * extras/hbxlsxml/xlsxml.prg + * extras/httpsrv/cookie.prg + * extras/httpsrv/session.prg + * extras/httpsrv/uhttpd.prg + * src/compiler/hbmain.c + * src/debug/dbgtarr.prg + * src/debug/dbgthsh.prg + * src/debug/dbgtobj.prg + * src/debug/debugger.prg + * src/rdd/dbfcdx/dbfcdx1.c + * src/rdd/dbfnsx/dbfnsx1.c + * src/rdd/dbfntx/dbfntx1.c + * src/rdd/hbsix/sxcompat.prg + * src/rtl/tpersist.prg + * tests/and_or.prg + * tests/clsccast.prg + * tests/clsicast.prg + * tests/clsscast.prg + * tests/clsscope.prg + * tests/codebl.prg + * tests/cpinfo.prg + * tests/foreach.prg + * tests/inherit.prg + * tests/memvar.prg + * tests/mt/mttest01.prg + * tests/mt/mttest02.prg + * tests/mt/mttest03.prg + * tests/mt/mttest04.prg + * tests/mt/mttest05.prg + * tests/mt/mttest06.prg + * tests/mt/mttest07.prg + * tests/mt/mttest09.prg + * tests/mt/mttest10.prg + * tests/rddtest/rddmktst.prg + * tests/rddtest/rddtst.prg + * tests/rto_get.prg + * tests/rto_tb.prg + * tests/speedtst.prg + * tests/stripem.prg + * tests/testpre.prg + * tests/testwarn.prg + * tests/transtst.prg + * utils/hbtest/hbtest.prg + * utils/hbtest/rt_hvma.prg + * various formal cleanups + ! fixed ==/!= operator usage in hbxlsxml + 2012-10-03 11:15 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/include/hbapifs.h * harbour/src/rtl/filesys.c diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb index 0b6fc48a15..6001b07567 100644 --- a/harbour/config/postinst.hb +++ b/harbour/config/postinst.hb @@ -215,8 +215,8 @@ PROCEDURE Main( ... ) no zip 2.x compatible way to force creation of a new .zip, so we have to delete it first to avoid mixing in an existing .zip file. [vszakats] */ - cOldDir := hb_ps() + CurDir() - DirChange( GetEnvC( "HB_INSTALL_PKG_ROOT" ) ) + cOldDir := hb_cwd() + hb_cwd( GetEnvC( "HB_INSTALL_PKG_ROOT" ) ) mk_hb_processRun( PathSepToSelf( GetEnvC( "HB_DIR_ZIP" ) ) + "zip" +; " -q -9 -X -r -o" +; @@ -224,7 +224,7 @@ PROCEDURE Main( ... ) " . -i " + FNameEscape( GetEnvC( "HB_PKGNAME" ) + hb_ps() + "*" ) +; " -x *.tds -x *.exp" ) - DirChange( cOldDir ) + hb_cwd( cOldDir ) IF GetEnvC( "HB_PLATFORM" ) $ "win|wce" @@ -265,8 +265,8 @@ PROCEDURE Main( ... ) cGroup := iif( GetEnvC( "HB_PLATFORM" ) == "darwin" .OR. ; GetEnvC( "HB_PLATFORM" ) == "bsd", "wheel", "root" ) - cOldDir := hb_ps() + CurDir() - DirChange( GetEnvC( "HB_INSTALL_PKG_ROOT" ) ) + cOldDir := hb_cwd() + hb_cwd( GetEnvC( "HB_INSTALL_PKG_ROOT" ) ) /* TODO: Add support for non-GNU non-BSD tar (which gets the data from stdio) */ @@ -276,7 +276,7 @@ PROCEDURE Main( ... ) iif( lGNU_Tar, " --owner=" + cOwner + " --group=" + cGroup, "" ) +; " ." ) - DirChange( cOldDir ) + hb_cwd( cOldDir ) IF !( GetEnvC( "HB_PLATFORM" ) == "dos" ) diff --git a/harbour/contrib/gtwvg/3state.prg b/harbour/contrib/gtwvg/3state.prg index 53d888b342..1208781317 100644 --- a/harbour/contrib/gtwvg/3state.prg +++ b/harbour/contrib/gtwvg/3state.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 07Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,13 +74,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS Wvg3State INHERIT WvgWindow, WvgDataRef @@ -102,7 +102,7 @@ CLASS Wvg3State INHERIT WvgWindow, WvgDataRef METHOD handleEvent( nMessage, aNM ) ENDCLASS -/*-*/ +// METHOD Wvg3State:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -114,7 +114,7 @@ METHOD Wvg3State:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD Wvg3State:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -144,7 +144,7 @@ METHOD Wvg3State:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD Wvg3State:handleEvent( nMessage, aNM ) @@ -178,7 +178,7 @@ METHOD Wvg3State:handleEvent( nMessage, aNM ) RETURN 1 -/*-*/ +// METHOD Wvg3State:destroy() @@ -188,7 +188,7 @@ METHOD Wvg3State:destroy() RETURN NIL -/*-*/ +// METHOD Wvg3State:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -196,7 +196,7 @@ METHOD Wvg3State:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD Wvg3State:setCaption( xCaption ) @@ -207,4 +207,4 @@ METHOD Wvg3State:setCaption( xCaption ) RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/activex.prg b/harbour/contrib/gtwvg/activex.prg index adc7def020..4cc8d8eacb 100644 --- a/harbour/contrib/gtwvg/activex.prg +++ b/harbour/contrib/gtwvg/activex.prg @@ -50,9 +50,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -62,9 +62,9 @@ * Pritpal Bedi * 08Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -75,13 +75,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS WvgActiveXControl FROM WvgWindow @@ -127,7 +127,7 @@ CLASS WvgActiveXControl FROM WvgWindow ENDCLASS -/*-*/ +// METHOD WvgActiveXControl:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -140,7 +140,7 @@ METHOD WvgActiveXControl:new( oParent, oOwner, aPos, aSize, aPresParams, lVisibl RETURN Self -/*-*/ +// METHOD WvgActiveXControl:Create( oParent, oOwner, aPos, aSize, aPresParams, lVisible, cCLSID, cLicense ) LOCAL hObj, hWnd @@ -180,7 +180,7 @@ METHOD WvgActiveXControl:Create( oParent, oOwner, aPos, aSize, aPresParams, lVis __AxDoVerb( ::pWnd, -4 ) IF !Empty( ::hEvents ) - ::oOle:__hSink := __AxRegisterHandler( ::oOle:__hObj, {|nEvent,...| ::execEvent( nEvent, ... ) } ) + ::oOle:__hSink := __AxRegisterHandler( ::oOle:__hObj, {| nEvent, ... | ::execEvent( nEvent, ... ) } ) ENDIF #if 0 @@ -200,14 +200,14 @@ METHOD WvgActiveXControl:Create( oParent, oOwner, aPos, aSize, aPresParams, lVis RETURN Self -/*-*/ +// PROCEDURE execEvent( nEvent, ... ) CLASS WvgActiveXControl #if 0 LOCAL cEvents := HB_ValToStr( nEvent ) + ", " LOCAL aEvents := { ... } - aEval( aEvents, { | xEvent | cEvents += HB_ValToStr( xEvent ) + ", " } ) + aEval( aEvents, {| xEvent | cEvents += HB_ValToStr( xEvent ) + ", " } ) hb_TraceLog( cEvents ) #endif @@ -217,7 +217,7 @@ PROCEDURE execEvent( nEvent, ... ) CLASS WvgActiveXControl RETURN -/*-*/ +// METHOD WvgActiveXControl:handleEvent( nEvent, aNM ) LOCAL nHandled := 0 @@ -242,7 +242,7 @@ METHOD WvgActiveXControl:handleEvent( nEvent, aNM ) RETURN nHandled -/*-*/ +// METHOD WvgActiveXControl:OnError() #if 0 @@ -250,7 +250,7 @@ METHOD WvgActiveXControl:OnError() #endif RETURN HB_ExecFromArray( ::oOLE, __GetMessage(), HB_AParams() ) -/*-*/ +// METHOD WvgActiveXControl:Destroy() @@ -264,7 +264,7 @@ METHOD WvgActiveXControl:Destroy() RETURN NIL -/*-*/ +// METHOD WvgActiveXControl:mapEvent( nEvent, bBlock ) @@ -274,66 +274,66 @@ METHOD WvgActiveXControl:mapEvent( nEvent, bBlock ) RETURN Self -/*-*/ +// METHOD WvgActiveXControl:inheritPresParams() Local lSuccess := .t. RETURN lSuccess -/*-*/ +// METHOD WvgActiveXControl:presParamsChanged() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:setInputFocus() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:subscribeStdEvents() RETURN NIL -/*-*/ +// METHOD WvgActiveXControl:unsubscribeStdEvents() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:keyDown() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:click() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:dblClick() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:mouseDown() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:mouseUp() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:mouseMove() RETURN Self -/*-*/ +// METHOD WvgActiveXControl:activate() RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/bitmap.prg b/harbour/contrib/gtwvg/bitmap.prg index 838c074d70..87bc3d6f1b 100644 --- a/harbour/contrib/gtwvg/bitmap.prg +++ b/harbour/contrib/gtwvg/bitmap.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 06Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,13 +74,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS WvgBitmap @@ -114,13 +114,13 @@ CLASS WvgBitmap ENDCLASS -/*-*/ +// METHOD new() CLASS WvgBitmap RETURN Self -/*-*/ +// METHOD create( oPScompat ) CLASS WvgBitmap @@ -133,7 +133,7 @@ METHOD create( oPScompat ) CLASS WvgBitmap RETURN Self -/*-*/ +// METHOD destroy() CLASS WvgBitmap @@ -146,4 +146,4 @@ METHOD destroy() CLASS WvgBitmap RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/checkbox.prg b/harbour/contrib/gtwvg/checkbox.prg index 3d8d32f9ed..36b1e325ad 100644 --- a/harbour/contrib/gtwvg/checkbox.prg +++ b/harbour/contrib/gtwvg/checkbox.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 05Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef @@ -100,7 +100,7 @@ CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef ASSIGN selected( bBlock ) INLINE ::sl_lbClick := bBlock ENDCLASS -/*-*/ +// METHOD WvgCheckBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -112,7 +112,7 @@ METHOD WvgCheckBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgCheckBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -139,7 +139,7 @@ METHOD WvgCheckBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgCheckBox:handleEvent( nMessage, aNM ) @@ -194,19 +194,19 @@ METHOD WvgCheckBox:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgCheckBox:destroy() ::wvgWindow:destroy() RETURN NIL -/*-*/ +// METHOD WvgCheckBox:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgCheckBox:setCaption( xCaption ) @@ -217,4 +217,4 @@ METHOD WvgCheckBox:setCaption( xCaption ) RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/class.prg b/harbour/contrib/gtwvg/class.prg index c94db86650..932e07aaf7 100644 --- a/harbour/contrib/gtwvg/class.prg +++ b/harbour/contrib/gtwvg/class.prg @@ -54,17 +54,17 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Wvt*Classes * 2004 * Pritpal Bedi */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "inkey.ch" @@ -73,7 +73,7 @@ #include "wvtwin.ch" -/*-*/ +// #define K_LBUTTONPRESSED 1021 #define K_RBUTTONPRESSED 1022 @@ -92,18 +92,18 @@ #define K_SBTHUMBTRACKVERT 1059 #define K_SBTHUMBTRACKHORZ 1060 -/*-*/ +// #define OBJ_CHILD_OBJ 1 #define OBJ_CHILD_EVENTS 2 #define OBJ_CHILD_DATABLOCK 3 #define OBJ_CHILD_REFRESHBLOCK 4 -/*-*/ +// /* * Class WvtDialog */ -/*-*/ +// CLASS wvtDialog @@ -185,11 +185,11 @@ CLASS wvtDialog METHOD AddObject( oObject ) INLINE aadd( ::aObjects, oObject ) METHOD MaxRow() INLINE ::nRows - 1 METHOD MaxCol() INLINE ::nCols - 1 - METHOD OnTimer() INLINE aeval( ::aObjects, {|o| o:OnTimer() } ) + METHOD OnTimer() INLINE aeval( ::aObjects, {| o | o:OnTimer() } ) ENDCLASS -/*-*/ +// METHOD wvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth,nFontBold,nFontQuality ) LOCAL fnt_:= Wvt_GetFontInfo() @@ -246,7 +246,7 @@ METHOD wvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth,nFont RETURN Self -/*-*/ +// METHOD wvtDialog:Create() LOCAL aPalette, i, j @@ -302,7 +302,7 @@ METHOD wvtDialog:Create() next WvtSetPaint( wvg_GetPaint( ::cPaintBlockID ) ) - IF ascan( ::aObjects, {|o| o:lTabStop } ) > 0 + IF ascan( ::aObjects, {| o | o:lTabStop } ) > 0 ::lTabStops := .t. ENDIF @@ -316,7 +316,7 @@ METHOD wvtDialog:Create() RETURN Self -/*-*/ +// METHOD wvtDialog:Destroy() @@ -324,7 +324,7 @@ METHOD wvtDialog:Destroy() ::oMenu:Destroy() ENDIF - aeval( ::aObjects, {|o| o:destroy() } ) + aeval( ::aObjects, {| o | o:destroy() } ) Wvt_SetTooltip( 0,0,0,0,"" ) Wvt_SetTooltipActive( ::oldToolTipActive ) @@ -356,7 +356,7 @@ METHOD wvtDialog:Destroy() RETURN nil -/*-*/ +// METHOD wvtDialog:Event() LOCAL nKey @@ -369,7 +369,7 @@ METHOD wvtDialog:Event() RETURN nKey -/*-*/ +// METHOD wvtDialog:Execute() @@ -386,7 +386,7 @@ METHOD wvtDialog:Execute() RETURN ::nKey -/*-*/ +// METHOD wvtDialog:Inkey() LOCAL n, oObj, nID, i @@ -465,7 +465,7 @@ METHOD wvtDialog:Inkey() oObj := ::aObjects[ ::nObjOver ] IF oObj:oParent:ClassName == "WVTBROWSE" nID := oObj:oParent:nID - IF ( n := ascan( ::aObjects, {|o| o:nID == nID } ) ) > 0 + IF ( n := ascan( ::aObjects, {| o | o:nID == nID } ) ) > 0 ::nCurObj := n ENDIF ENDIF @@ -577,7 +577,7 @@ METHOD wvtDialog:Inkey() IF !( ::lEventHandled ) IF ::nCurObj > 0 IF !empty( ::aDialogKeys ) - IF ( n := ascan( ::aDialogKeys, {|e_| e_[ 1 ] == ::nKey } ) ) > 0 + IF ( n := ascan( ::aDialogKeys, {| e_ | e_[ 1 ] == ::nKey } ) ) > 0 Eval( ::aDialogKeys[ n, 2 ], self, ::oCurObj ) ENDIF ENDIF @@ -605,7 +605,7 @@ METHOD wvtDialog:Inkey() RETURN ::nKey -/*-*/ +// METHOD wvtDialog:MouseOver() LOCAL mRow := MRow() @@ -613,10 +613,10 @@ METHOD wvtDialog:MouseOver() LOCAL nObj nObj := ascan( ::aObjects, ; - {|o| o:nType != DLG_OBJ_STATIC .AND. ; - o:nType != DLG_OBJ_TOOLBAR .AND. ; - mRow >= o:nTop .AND. mRow <= o:nBottom .AND. ; - mCol >= o:nLeft .AND. mCol <= o:nRight } ) + {| o | o:nType != DLG_OBJ_STATIC .AND. ; + o:nType != DLG_OBJ_TOOLBAR .AND. ; + mRow >= o:nTop .AND. mRow <= o:nBottom .AND. ; + mCol >= o:nLeft .AND. mCol <= o:nRight } ) ::nObjOver := nObj ::oObjOver := iif( nObj > 0, ::aObjects[ nObj ], nil ) @@ -628,7 +628,7 @@ METHOD wvtDialog:MouseOver() RETURN Self -/*-*/ +// METHOD wvtDialog:Update() @@ -636,7 +636,7 @@ METHOD wvtDialog:Update() RETURN Self -/*-*/ +// METHOD wvtDialog:CreateObjects() LOCAL i, nObjs @@ -692,7 +692,7 @@ METHOD wvtDialog:CreateObjects() RETURN self -/*-*/ +// METHOD wvtDialog:Eval( bBlock, p1,p2,p3,p4,p5 ) LOCAL lRet @@ -703,7 +703,7 @@ METHOD wvtDialog:Eval( bBlock, p1,p2,p3,p4,p5 ) RETURN lRet -/*-*/ +// METHOD wvtDialog:ActivateMenu() LOCAL nMenu:= Wvt_GetLastMenuEvent() @@ -721,17 +721,17 @@ METHOD wvtDialog:ActivateMenu() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtObject * * Must never be used directly. It is parent class FOR all other objects! */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtObject @@ -844,7 +844,7 @@ CLASS WvtObject ENDCLASS -/*-*/ +// METHOD WvtObject:New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) @@ -926,7 +926,7 @@ METHOD WvtObject:New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtObject:Create() @@ -935,7 +935,7 @@ METHOD WvtObject:Create() RETURN Self -/*-*/ +// METHOD WvtObject:Destroy() @@ -951,7 +951,7 @@ METHOD WvtObject:Destroy() RETURN Nil -/*-*/ +// METHOD WvtObject:CreatePopup() LOCAL i, nID @@ -971,7 +971,7 @@ METHOD WvtObject:CreatePopup() RETURN Self -/*-*/ +// METHOD WvtObject:ShowPopup() LOCAL lRet := .f., nRet, n, aPos @@ -982,7 +982,7 @@ METHOD WvtObject:ShowPopup() nRet := Wvt_TrackPopupMenu( ::hPopup, TPM_CENTERALIGN +TPM_RETURNCMD, ; aPos[ 1 ], aPos[ 2 ], 0, Wvt_GetWindowHandle() ) IF nRet > 0 - IF ( n := ascan( ::aPopup, {|e_| e_[ 3 ] == nRet } ) ) > 0 + IF ( n := ascan( ::aPopup, {| e_ | e_[ 3 ] == nRet } ) ) > 0 lRet := .t. IF HB_ISBLOCK( ::aPopup[ n,2 ] ) @@ -994,15 +994,15 @@ METHOD WvtObject:ShowPopup() RETURN lRet -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtBrowse */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtBrowse FROM WvtObject @@ -1036,7 +1036,7 @@ CLASS WvtBrowse FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtBrowse:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -1044,7 +1044,7 @@ METHOD WvtBrowse:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtBrowse:Create() @@ -1080,7 +1080,7 @@ METHOD WvtBrowse:Create() RETURN Self -/*-*/ +// METHOD WvtBrowse:SetVBar() @@ -1112,7 +1112,7 @@ METHOD WvtBrowse:SetVBar() RETURN Self -/*-*/ +// METHOD WvtBrowse:SetHBar() @@ -1142,7 +1142,7 @@ METHOD WvtBrowse:SetHBar() RETURN Self -/*-*/ +// METHOD WvtBrowse:Refresh() LOCAL nWorkArea := Select() @@ -1160,7 +1160,7 @@ METHOD WvtBrowse:Refresh() RETURN Self -/*-*/ +// METHOD WvtBrowse:HandleEvent( nKey ) LOCAL lRet := .f. @@ -1171,7 +1171,7 @@ METHOD WvtBrowse:HandleEvent( nKey ) RETURN lRet -/*-*/ +// METHOD WvtBrowse:NotifyChild( nIndex, nKey, oCurObj ) LOCAL xData, i @@ -1203,7 +1203,7 @@ METHOD WvtBrowse:NotifyChild( nIndex, nKey, oCurObj ) RETURN Self -/*-*/ +// METHOD WvtBrowse:Hilite() LOCAL b := ::oBrw @@ -1212,7 +1212,7 @@ METHOD WvtBrowse:Hilite() RETURN Self -/*-*/ +// METHOD WvtBrowse:DeHilite() LOCAL b := ::oBrw @@ -1221,7 +1221,7 @@ METHOD WvtBrowse:DeHilite() RETURN Self -/*-*/ +// METHOD WvtBrowse:SetTooltip() LOCAL cTip, nArea @@ -1247,7 +1247,7 @@ METHOD WvtBrowse:SetTooltip() RETURN Self -/*-*/ +// METHOD WvtBrowse:SaveSettings() @@ -1257,7 +1257,7 @@ METHOD WvtBrowse:SaveSettings() RETURN Self -/*-*/ +// METHOD WvtBrowse:RestSettings() @@ -1267,7 +1267,7 @@ METHOD WvtBrowse:RestSettings() RETURN Self -/*-*/ +// METHOD WvtBrowse:PaintBlock( nPaintObj ) LOCAL bBlock, b := ::oBrw @@ -1298,15 +1298,15 @@ METHOD WvtBrowse:PaintBlock( nPaintObj ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * WvtStatusBar */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtStatusBar FROM WvtObject @@ -1324,7 +1324,7 @@ CLASS WvtStatusBar FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtStatusBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -1339,7 +1339,7 @@ METHOD WvtStatusBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtStatusBar:Create() @@ -1350,13 +1350,13 @@ METHOD WvtStatusBar:Create() RETURN Self -/*-*/ +// METHOD WvtStatusBar:PaintBlock() LOCAL a_:= {}, nPanels - aeval( ::aPanels, {|o| aadd( a_,o:nTop ) , aadd( a_,o:nLeft ), ; - aadd( a_,o:nBottom ), aadd( a_,o:nRight ) } ) + aeval( ::aPanels, {| o | aadd( a_,o:nTop ) , aadd( a_,o:nLeft ), ; + aadd( a_,o:nBottom ), aadd( a_,o:nRight ) } ) a_[ len( a_ ) ]++ nPanels := len( ::aPanels ) @@ -1367,7 +1367,7 @@ METHOD WvtStatusBar:PaintBlock() RETURN Self -/*-*/ +// METHOD WvtStatusBar:SetPanels( aPanels ) LOCAL i, oPanel, nID @@ -1400,7 +1400,7 @@ METHOD WvtStatusBar:SetPanels( aPanels ) RETURN self -/*-*/ +// METHOD WvtStatusBar:Update( nPanel, cText, cColor ) LOCAL oPanel @@ -1414,7 +1414,7 @@ METHOD WvtStatusBar:Update( nPanel, cText, cColor ) RETURN Self -/*-*/ +// METHOD WvtStatusBar:SetText( nPanel, cText, cColor ) LOCAL oPanel @@ -1429,7 +1429,7 @@ METHOD WvtStatusBar:SetText( nPanel, cText, cColor ) RETURN Self -/*-*/ +// METHOD WvtStatusBar:SetIcon( nPanel, cIconFile ) @@ -1439,7 +1439,7 @@ METHOD WvtStatusBar:SetIcon( nPanel, cIconFile ) RETURN Self -/*-*/ +// METHOD WvtStatusBar:Refresh() LOCAL i @@ -1450,15 +1450,15 @@ METHOD WvtStatusBar:Refresh() RETURN nil -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtPanel */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtPanel FROM WvtObject @@ -1474,7 +1474,7 @@ CLASS WvtPanel FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtPanel:New( oParent, nId, nTop, nLeft ) @@ -1482,7 +1482,7 @@ METHOD WvtPanel:New( oParent, nId, nTop, nLeft ) RETURN Self -/*-*/ +// METHOD WvtPanel:Refresh() @@ -1492,15 +1492,15 @@ METHOD WvtPanel:Refresh() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtLabel */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtLabel FROM WvtObject @@ -1519,7 +1519,7 @@ CLASS WvtLabel FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtLabel:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -1527,7 +1527,7 @@ METHOD WvtLabel:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtLabel:Create( lConfg ) @@ -1554,7 +1554,7 @@ METHOD WvtLabel:Create( lConfg ) RETURN Self -/*-*/ +// METHOD WvtLabel:Refresh() @@ -1562,7 +1562,7 @@ METHOD WvtLabel:Refresh() RETURN Self -/*-*/ +// METHOD WvtLabel:SetText( cTxt ) @@ -1573,7 +1573,7 @@ METHOD WvtLabel:SetText( cTxt ) RETURN Self -/*-*/ +// METHOD WvtLabel:SetTextColor( nRGB ) @@ -1585,7 +1585,7 @@ METHOD WvtLabel:SetTextColor( nRGB ) RETURN Self -/*-*/ +// METHOD WvtLabel:SetBackColor( nRGB ) @@ -1597,7 +1597,7 @@ METHOD WvtLabel:SetBackColor( nRGB ) RETURN Self -/*-*/ +// METHOD WvtLabel:Configure() @@ -1613,7 +1613,7 @@ METHOD WvtLabel:Configure() RETURN Self -/*-*/ +// METHOD WvtLabel:HoverOn() LOCAL lOn := .f. @@ -1633,7 +1633,7 @@ METHOD WvtLabel:HoverOn() RETURN Self -/*-*/ +// METHOD WvtLabel:HoverOff() LOCAL lOn := .f. @@ -1653,15 +1653,15 @@ METHOD WvtLabel:HoverOff() Return Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtToolBar */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtToolBar FROM WvtObject @@ -1688,7 +1688,7 @@ CLASS WvtToolBar FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtToolBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -1705,7 +1705,7 @@ METHOD WvtToolBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtToolBar:Create() @@ -1714,7 +1714,7 @@ METHOD WvtToolBar:Create() ::lHidden := .t. ENDIF - aeval( ::aObjects, {|o| o:lActive := ::lActive } ) + aeval( ::aObjects, {| o | o:lActive := ::lActive } ) ::bPaint := {|| ::PaintToolBar() } aadd( ::aPaint, { ::bPaint,; @@ -1724,7 +1724,7 @@ METHOD WvtToolBar:Create() RETURN Self -/*-*/ +// METHOD WvtToolBar:Refresh() @@ -1736,7 +1736,7 @@ METHOD WvtToolBar:Refresh() RETURN Self -/*-*/ +// METHOD WvtToolBar:PaintToolBar() @@ -1746,7 +1746,7 @@ METHOD WvtToolBar:PaintToolBar() RETURN Self -/*-*/ +// METHOD WvtToolBar:AddButton( cFileImage, bBlock, cTooltip ) LOCAL oObj, nCol @@ -1780,7 +1780,7 @@ METHOD WvtToolBar:AddButton( cFileImage, bBlock, cTooltip ) RETURN Self -/*-*/ +// METHOD WvtToolBar:HoverOn() @@ -1791,21 +1791,21 @@ METHOD WvtToolBar:HoverOn() ::cScreen := SaveScreen( ::nTop, ::nLeft, ::nBottom, ::nRight ) ::wScreen := Wvt_SaveScreen( ::nTop, ::nLeft, ::nBottom, ::nRight ) #ENDIF - aeval( ::aObjects, {|o| o:lActive := ::lActive } ) + aeval( ::aObjects, {| o | o:lActive := ::lActive } ) ::Refresh() ENDIF RETURN self -/*-*/ +// METHOD WvtToolBar:HoverOff() IF ::lFloating .and. !( ::lHidden ) ::lHidden := .t. ::lActive := .f. - aeval( ::aObjects, {|o| o:lActive := ::lActive } ) + aeval( ::aObjects, {| o | o:lActive := ::lActive } ) #IF 0 RestScreen( ::nTop, ::nLeft, ::nBottom, ::nRight, ::cScreen ) Wvt_RestScreen( ::nTop, ::nLeft, ::nBottom, ::nRight, ::wScreen, .f. ) @@ -1815,15 +1815,15 @@ METHOD WvtToolBar:HoverOff() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtToolButton */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtToolButton FROM WvtObject @@ -1843,7 +1843,7 @@ CLASS WvtToolButton FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtToolButton:New( oParent ) @@ -1851,7 +1851,7 @@ METHOD WvtToolButton:New( oParent ) RETURN Self -/*-*/ +// METHOD WvtToolButton:Create() @@ -1863,7 +1863,7 @@ METHOD WvtToolButton:Create() RETURN Self -/*-*/ +// METHOD WvtToolButton:Refresh() @@ -1873,7 +1873,7 @@ METHOD WvtToolButton:Refresh() RETURN Self -/*-*/ +// METHOD WvtToolButton:PaintButton() @@ -1887,7 +1887,7 @@ METHOD WvtToolButton:PaintButton() RETURN Self -/*-*/ +// METHOD WvtToolButton:LeftDown() LOCAL lRet := .f. @@ -1899,7 +1899,7 @@ METHOD WvtToolButton:LeftDown() RETURN lRet -/*-*/ +// METHOD WvtToolButton:LeftUp() LOCAL lRet := .f. @@ -1912,7 +1912,7 @@ METHOD WvtToolButton:LeftUp() RETURN lRet -/*-*/ +// METHOD WvtToolButton:HoverOn() @@ -1924,7 +1924,7 @@ METHOD WvtToolButton:HoverOn() RETURN Self -/*-*/ +// METHOD WvtToolButton:HoverOff() @@ -1936,15 +1936,15 @@ METHOD WvtToolButton:HoverOff() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtImage */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtImage FROM WvtObject @@ -1959,7 +1959,7 @@ CLASS WvtImage FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtImage:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -1967,7 +1967,7 @@ METHOD WvtImage:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtImage:Create() @@ -1981,7 +1981,7 @@ METHOD WvtImage:Create() RETURN Self -/*-*/ +// METHOD WvtImage:SetImage( cImage ) @@ -1992,15 +1992,15 @@ METHOD WvtImage:SetImage( cImage ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtStatic */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtStatic FROM WvtObject @@ -2031,7 +2031,7 @@ CLASS WvtStatic FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtStatic:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -2039,7 +2039,7 @@ METHOD WvtStatic:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtStatic:Create() LOCAL lInside := .f. @@ -2119,19 +2119,19 @@ METHOD WvtStatic:Create() RETURN Self -/*-*/ +// METHOD WvtStatic:HoverOn() RETURN Self -/*-*/ +// METHOD WvtStatic:HoverOff() RETURN Self -/*-*/ +// METHOD WvtStatic:Refresh() @@ -2139,15 +2139,15 @@ METHOD WvtStatic:Refresh() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtPushButton */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtPushButton FROM WvtObject @@ -2165,7 +2165,7 @@ CLASS WvtPushButton FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtPushButton:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -2173,7 +2173,7 @@ METHOD WvtPushButton:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtPushButton:Create() @@ -2186,7 +2186,7 @@ METHOD WvtPushButton:Create() RETURN Self -/*-*/ +// METHOD WvtPushButton:PaintButton() @@ -2199,7 +2199,7 @@ METHOD WvtPushButton:PaintButton() RETURN Self -/*-*/ +// METHOD WvtPushButton:LeftDown() @@ -2207,7 +2207,7 @@ METHOD WvtPushButton:LeftDown() RETURN .t. -/*-*/ +// METHOD WvtPushButton:LeftUp() @@ -2216,15 +2216,15 @@ METHOD WvtPushButton:LeftUp() RETURN .t. -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtGets */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtGets FROM WvtObject @@ -2249,7 +2249,7 @@ CLASS WvtGets FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtGets:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -2257,7 +2257,7 @@ METHOD WvtGets:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtGets:Create() LOCAL i, GetList @@ -2285,7 +2285,7 @@ METHOD WvtGets:Create() RETURN Self -/*-*/ +// METHOD WvtGets:PaintBlock( nIndex ) LOCAL nLen, bPaint @@ -2300,19 +2300,19 @@ METHOD WvtGets:PaintBlock( nIndex ) RETURN Self -/*-*/ +// METHOD WvtGets:SetFocus() RETURN Self -/*-*/ +// METHOD WvtGets:KillFocus() RETURN Self -/*-*/ +// METHOD WvtGets:AddGets( nRow, nCol, xVar, cPic, cColor, bValid, bWhen ) @@ -2320,7 +2320,7 @@ METHOD WvtGets:AddGets( nRow, nCol, xVar, cPic, cColor, bValid, bWhen ) RETURN Self -/*-*/ +// METHOD WvtGets:HandleEvent( nKey ) LOCAL lRet := .f. @@ -2333,7 +2333,7 @@ METHOD WvtGets:HandleEvent( nKey ) RETURN lRet -/*-*/ +// METHOD WvtGets:Read() @@ -2341,20 +2341,20 @@ METHOD WvtGets:Read() RETURN Self -/*-*/ +// METHOD WvtGets:GetData() LOCAL aData := NIL RETURN aData -/*-*/ +// METHOD WvtGets:SetData( /*aData*/ ) RETURN Self -/*-*/ +// METHOD WvtGets:Hilite() @@ -2362,7 +2362,7 @@ METHOD WvtGets:Hilite() RETURN Self -/*-*/ +// METHOD WvtGets:DeHilite() @@ -2370,15 +2370,15 @@ METHOD WvtGets:DeHilite() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtScrollBar */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtScrollBar FROM WvtObject @@ -2437,7 +2437,7 @@ CLASS WvtScrollBar FROM WvtObject ENDCLASS -/*-*/ +// METHOD wvtScrollbar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -2445,7 +2445,7 @@ METHOD wvtScrollbar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD wvtScrollbar:Create() @@ -2547,7 +2547,7 @@ METHOD wvtScrollbar:Create() RETURN Self -/*-*/ +// METHOD wvtScrollbar:Configure( nTop, nLeft, nBottom, nRight ) @@ -2611,7 +2611,7 @@ METHOD wvtScrollbar:Configure( nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD wvtScrollbar:Refresh() @@ -2619,7 +2619,7 @@ METHOD wvtScrollbar:Refresh() RETURN Self -/*-*/ +// METHOD wvtScrollbar:SetPos( nTotal, nCurrent ) @@ -2634,7 +2634,7 @@ METHOD wvtScrollbar:SetPos( nTotal, nCurrent ) RETURN Self -/*-*/ +// METHOD wvtScrollbar:ThumbPos() LOCAL nNewPos, nRecPerUnit, nCurUnit @@ -2684,13 +2684,13 @@ METHOD wvtScrollbar:ThumbPos() RETURN Self -/*-*/ +// METHOD wvtScrollbar:GetPos() RETURN ::nCurrent -/*-*/ +// METHOD wvtScrollbar:SetTooltip() @@ -2701,7 +2701,7 @@ METHOD wvtScrollbar:SetTooltip() RETURN Self -/*-*/ +// METHOD wvtScrollbar:HandleEvent( nKey ) LOCAL nmRow, nmCol, nOff @@ -2911,15 +2911,15 @@ METHOD wvtScrollbar:HandleEvent( nKey ) RETURN lHit -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * CLASS WvtBanner */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtBanner FROM WvtObject @@ -2950,7 +2950,7 @@ CLASS WvtBanner FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtBanner:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -2958,7 +2958,7 @@ METHOD WvtBanner:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtBanner:Create() @@ -2992,7 +2992,7 @@ METHOD WvtBanner:Create() RETURN Self -/*-*/ +// METHOD WvtBanner:Destroy() @@ -3000,13 +3000,13 @@ METHOD WvtBanner:Destroy() RETURN nil -/*-*/ +// METHOD WvtBanner:Configure() RETURN Self -/*-*/ +// METHOD WvtBanner:OnTimer() @@ -3014,7 +3014,7 @@ METHOD WvtBanner:OnTimer() RETURN Self -/*-*/ +// METHOD WvtBanner:SetText( cText ) @@ -3025,7 +3025,7 @@ METHOD WvtBanner:SetText( cText ) RETURN Self -/*-*/ +// METHOD WvtBanner:Refresh() LOCAL nNewTime @@ -3066,7 +3066,7 @@ METHOD WvtBanner:Refresh() RETURN Self -/*-*/ +// METHOD WvtBanner:HoverOn() @@ -3074,7 +3074,7 @@ METHOD WvtBanner:HoverOn() RETURN Self -/*-*/ +// METHOD WvtBanner:HoverOff() @@ -3082,15 +3082,15 @@ METHOD WvtBanner:HoverOff() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtTextBox */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtTextBox FROM WvtObject @@ -3106,7 +3106,7 @@ CLASS WvtTextBox FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtTextBox:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -3114,7 +3114,7 @@ METHOD WvtTextBox:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtTextBox:Create() @@ -3136,7 +3136,7 @@ METHOD WvtTextBox:Create() RETURN Self -/*-*/ +// METHOD WvtTextBox:Refresh() @@ -3144,13 +3144,13 @@ METHOD WvtTextBox:Refresh() RETURN Self -/*-*/ +// METHOD WvtTextBox:Configure() RETURN Self -/*-*/ +// METHOD WvtTextBox:SetText( cText ) @@ -3161,7 +3161,7 @@ METHOD WvtTextBox:SetText( cText ) RETURN Self -/*-*/ +// METHOD WvtTextBox:HoverOn( /*cText*/ ) @@ -3172,7 +3172,7 @@ METHOD WvtTextBox:HoverOn( /*cText*/ ) RETURN Self -/*-*/ +// METHOD WvtTextBox:HoverOff( /*cText*/ ) @@ -3183,15 +3183,15 @@ METHOD WvtTextBox:HoverOff( /*cText*/ ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtProgressBar */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtProgressBar FROM WvtObject @@ -3217,7 +3217,7 @@ CLASS WvtProgressBar FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtProgressBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) @@ -3225,7 +3225,7 @@ METHOD WvtProgressBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvtProgressBar:Create() @@ -3243,7 +3243,7 @@ METHOD WvtProgressBar:Create() RETURN Self -/*-*/ +// METHOD WvtProgressBar:Display( nCurrent, nTotal ) @@ -3267,7 +3267,7 @@ METHOD WvtProgressBar:Display( nCurrent, nTotal ) ::nBackColor, ::nBarColor, ::cImage, ::lVertical, ::nDirection ) RETURN Self -/*-*/ +// METHOD WvtProgressBar:Activate() @@ -3277,7 +3277,7 @@ METHOD WvtProgressBar:Activate() RETURN Self -/*-*/ +// METHOD WvtProgressBar:DeActivate() @@ -3289,16 +3289,16 @@ METHOD WvtProgressBar:DeActivate() RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtMenu * Peter Rees */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS wvtMenu @@ -3323,7 +3323,7 @@ CLASS wvtMenu ENDCLASS -/*-*/ +// METHOD wvtMenu:Create( cCaption ) ::aItems := {} @@ -3337,7 +3337,7 @@ METHOD wvtMenu:Create( cCaption ) RETURN Self -/*-*/ +// METHOD wvtMenu:Destroy() @@ -3354,7 +3354,7 @@ METHOD wvtMenu:Destroy() RETURN .T. -/*-*/ +// METHOD wvtMenu:AddItem( cCaption, bAction ) LOCAL lResult:= .F., aItem @@ -3385,7 +3385,7 @@ METHOD wvtMenu:AddItem( cCaption, bAction ) RETURN lResult -/*-*/ +// METHOD wvtMenu:DelAllItems() LOCAL lResult:= .T., nItems @@ -3398,7 +3398,7 @@ METHOD wvtMenu:DelAllItems() RETURN lResult -/*-*/ +// METHOD wvtMenu:DelItem( nItemNum ) LOCAL lResult:= .F. @@ -3420,7 +3420,7 @@ METHOD wvtMenu:DelItem( nItemNum ) RETURN lResult -/*-*/ +// METHOD wvtMenu:EnableItem( nItemNum ) LOCAL nPrevious:= -1 @@ -3431,7 +3431,7 @@ METHOD wvtMenu:EnableItem( nItemNum ) RETURN nPrevious -/*-*/ +// METHOD wvtMenu:DisableItem( nItemNum ) LOCAL nPrevious:= -1 @@ -3442,13 +3442,13 @@ METHOD wvtMenu:DisableItem( nItemNum ) RETURN nPrevious -/*-*/ +// METHOD wvtMenu:NumItems() RETURN LEN( ::aItems ) -/*-*/ +// METHOD wvtMenu:GetItem( nItemNum ) LOCAL nItems := ::NumItems(), aResult:= NIL @@ -3459,7 +3459,7 @@ METHOD wvtMenu:GetItem( nItemNum ) RETURN aResult -/*-*/ +// METHOD wvtMenu:FindMenuItemById( nId ) LOCAL x, aResult:= {} @@ -3478,7 +3478,7 @@ METHOD wvtMenu:FindMenuItemById( nId ) RETURN aResult -/*-*/ +// METHOD wvtMenu:DrawMenuBar() @@ -3486,15 +3486,15 @@ METHOD wvtMenu:DrawMenuBar() RETURN NIL -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvtConsole */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvtConsole FROM WvtObject @@ -3504,7 +3504,7 @@ CLASS WvtConsole FROM WvtObject ENDCLASS -/*-*/ +// METHOD WvtConsole:New( oParent ) @@ -3512,7 +3512,7 @@ METHOD WvtConsole:New( oParent ) RETURN Self -/*-*/ +// METHOD WvtConsole:Say( nRow, nCol, xExp, cColor ) LOCAL nCRow, nCCol, nCursor @@ -3528,7 +3528,7 @@ METHOD WvtConsole:Say( nRow, nCol, xExp, cColor ) RETURN Self -/*-*/ +// METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor ) @@ -3545,15 +3545,15 @@ METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * TBrowseWVG From TBrowse */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #define _TBCI_COLOBJECT 1 /* column object */ #define _TBCI_COLWIDTH 2 /* width of the column */ @@ -3571,7 +3571,7 @@ METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor ) #define _TBCI_LASTSPACE 14 /* space after last visible column */ #define _TBCI_SIZE 14 /* size of array with TBrowse column data */ -/*-*/ +// CLASS TBrowseWVG FROM TBrowse @@ -3581,7 +3581,7 @@ CLASS TBrowseWVG FROM TBrowse ENDCLASS -/*-*/ +// METHOD TBrowseWVG:SetVisible() LOCAL lFirst, aCol, nColPos @@ -3609,4 +3609,4 @@ METHOD TBrowseWVG:SetVisible() RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/combobox.prg b/harbour/contrib/gtwvg/combobox.prg index 3a392465ec..3977e95cbd 100644 --- a/harbour/contrib/gtwvg/combobox.prg +++ b/harbour/contrib/gtwvg/combobox.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 26Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef @@ -118,7 +118,7 @@ CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD WvgComboBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -132,7 +132,7 @@ METHOD WvgComboBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgComboBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -174,13 +174,13 @@ METHOD WvgComboBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgComboBox:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgComboBox:destroy() #if 0 @@ -194,7 +194,7 @@ METHOD WvgComboBox:destroy() ::wvgWindow:destroy() RETURN NIL -/*-*/ +// METHOD WvgComboBox:handleEvent( nMessage, aNM ) @@ -267,7 +267,7 @@ METHOD WvgComboBox:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgComboBox:addItem( cItem ) @@ -277,7 +277,7 @@ METHOD WvgComboBox:addItem( cItem ) RETURN -1 -/*-*/ +// METHOD WvgComboBox:listBoxFocus( lFocus ) LOCAL lOldFocus := ::sendCBMessage( CB_GETDROPPEDSTATE ) @@ -288,7 +288,7 @@ METHOD WvgComboBox:listBoxFocus( lFocus ) RETURN lOldFocus -/*-*/ +// METHOD WvgComboBox:sleSize() @@ -298,7 +298,7 @@ METHOD WvgComboBox:sleSize() RETURN {0,0} -/*-*/ +// METHOD WvgComboBox:listBoxSize() @@ -308,14 +308,14 @@ METHOD WvgComboBox:listBoxSize() RETURN {0,0} -/*-*/ +// METHOD WvgComboBox:setIcon( nItem, cIcon ) HB_SYMBOL_UNUSED( nItem ) HB_SYMBOL_UNUSED( cIcon ) RETURN Self -/*-*/ +// METHOD WvgComboBox:itemMarked( ... ) LOCAL a_:= hb_aParams() @@ -326,7 +326,7 @@ METHOD WvgComboBox:itemMarked( ... ) ENDIF RETURN Self -/*-*/ +// METHOD WvgComboBox:itemSelected( ... ) LOCAL a_:= hb_aParams() @@ -337,7 +337,7 @@ METHOD WvgComboBox:itemSelected( ... ) ENDIF RETURN Self -/*-*/ +// METHOD WvgComboBox:drawItem( ... ) LOCAL a_:= hb_aParams() diff --git a/harbour/contrib/gtwvg/crt.prg b/harbour/contrib/gtwvg/crt.prg index 8ba0b20dee..c6ae0f32df 100644 --- a/harbour/contrib/gtwvg/crt.prg +++ b/harbour/contrib/gtwvg/crt.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// * * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 08Nov2008 * -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler @@ -256,9 +256,9 @@ CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler ENDCLASS -/*-*/ +// * Instance Initiation -/*-*/ +// METHOD WvgCrt:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -282,9 +282,9 @@ METHOD WvgCrt:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// * Life Cycle -/*-*/ +// METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) Local lRowCol := .T. @@ -316,8 +316,8 @@ METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::pGT := hb_gtSelect() ENDIF - HB_GtInfo( HB_GTI_NOTIFIERBLOCKGUI, {|nEvent, ...| ::notifier( nEvent, ... ) } ) - HB_GtInfo( HB_GTI_NOTIFIERBLOCK , {|nEvent, ...| ::notifierBlock( nEvent, ... ) } ) + HB_GtInfo( HB_GTI_NOTIFIERBLOCKGUI, {| nEvent, ... | ::notifier( nEvent, ... ) } ) + HB_GtInfo( HB_GTI_NOTIFIERBLOCK , {| nEvent, ... | ::notifierBlock( nEvent, ... ) } ) IF ::lModal ::style := WS_POPUP + WS_CAPTION + WS_SYSMENU @@ -361,7 +361,7 @@ METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -381,7 +381,7 @@ METHOD WvgCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgCrt:destroy() @@ -390,7 +390,7 @@ METHOD WvgCrt:destroy() ENDIF IF Len( ::aChildren ) > 0 - aeval( ::aChildren, {|o| o:destroy() } ) + aeval( ::aChildren, {| o | o:destroy() } ) ::aChildren := {} ENDIF @@ -408,27 +408,27 @@ METHOD WvgCrt:destroy() RETURN Self -/*-*/ +// * Methods -/*-*/ +// METHOD WvgCrt:currentPos() RETURN Self -/*-*/ +// METHOD WvgCrt:currentSize() RETURN { hb_gtInfo( HB_GTI_SCREENWIDTH ), hb_gtInfo( HB_GTI_SCREENHEIGHT ) } -/*-*/ +// METHOD WvgCrt:captureMouse() RETURN Self -/*-*/ +// METHOD WvgCrt:disable() @@ -436,7 +436,7 @@ METHOD WvgCrt:disable() RETURN Self -/*-*/ +// METHOD WvgCrt:enable() @@ -444,7 +444,7 @@ METHOD WvgCrt:enable() RETURN Self -/*-*/ +// METHOD WvgCrt:getFrameState() @@ -457,25 +457,25 @@ METHOD WvgCrt:getFrameState() RETURN WVGDLG_FRAMESTAT_NORMALIZED -/*-*/ +// METHOD WvgCrt:getHWND() RETURN ::hWnd -/*-*/ +// METHOD WvgCrt:getModalState() RETURN Self -/*-*/ +// METHOD WvgCrt:hasInputFocus() RETURN ::lHasInputFocus -/*-*/ +// METHOD WvgCrt:hide() @@ -483,7 +483,7 @@ METHOD WvgCrt:hide() RETURN Self -/*-*/ +// METHOD WvgCrt:invalidateRect( nTop, nLeft, nBottom, nRight ) @@ -496,31 +496,31 @@ METHOD WvgCrt:invalidateRect( nTop, nLeft, nBottom, nRight ) RETURN Self -/*-*/ +// METHOD WvgCrt:isEnabled() RETURN Self -/*-*/ +// METHOD WvgCrt:isVisible() RETURN Self -/*-*/ +// METHOD WvgCrt:lockPS() RETURN Self -/*-*/ +// METHOD WvgCrt:lockUpdate() RETURN Self -/*-*/ +// METHOD WvgCrt:menuBar() @@ -530,31 +530,31 @@ METHOD WvgCrt:menuBar() RETURN ::oMenu -/*-*/ +// METHOD WvgCrt:setColorBG() RETURN Self -/*-*/ +// METHOD WvgCrt:setColorFG() RETURN Self -/*-*/ +// METHOD WvgCrt:setFont() RETURN Self -/*-*/ +// METHOD WvgCrt:setFontCompoundName() RETURN "" -/*-*/ +// METHOD WvgCrt:setFrameState( nState ) Local lSuccess := .f. @@ -573,43 +573,43 @@ METHOD WvgCrt:setFrameState( nState ) ENDCASE RETURN lSuccess -/*-*/ +// METHOD WvgCrt:setModalState() RETURN Self -/*-*/ +// METHOD WvgCrt:setPointer() RETURN Self -/*-*/ +// METHOD WvgCrt:setTrackPointer() RETURN Self -/*-*/ +// METHOD WvgCrt:setPos() RETURN Self -/*-*/ +// METHOD WvgCrt:setPosAndSize() RETURN Self -/*-*/ +// METHOD WvgCrt:setPresParam() RETURN Self -/*-*/ +// METHOD WvgCrt:setSize( aSize, lPaint ) @@ -622,7 +622,7 @@ METHOD WvgCrt:setSize( aSize, lPaint ) RETURN Self -/*-*/ +// METHOD WvgCrt:show() @@ -631,38 +631,38 @@ METHOD WvgCrt:show() RETURN Self -/*-*/ +// METHOD WvgCrt:showModal() RETURN Self -/*-*/ +// METHOD WvgCrt:toBack() RETURN Self -/*-*/ +// METHOD WvgCrt:toFront() RETURN WVG_SetWindowPosToTop( ::hWnd ) -/*-*/ +// METHOD WvgCrt:unlockPS() RETURN Self -/*-*/ +// METHOD WvgCrt:winDevice() RETURN Self -/*-*/ +// * Callback Methods -/*-*/ +// METHOD WvgCrt:enter( xParam ) @@ -678,7 +678,7 @@ METHOD WvgCrt:enter( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:leave( xParam ) @@ -694,7 +694,7 @@ METHOD WvgCrt:leave( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:lbClick( xParam ) @@ -710,7 +710,7 @@ METHOD WvgCrt:lbClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:lbDblClick( xParam ) @@ -726,7 +726,7 @@ METHOD WvgCrt:lbDblClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:lbDown( xParam ) @@ -742,7 +742,7 @@ METHOD WvgCrt:lbDown( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:lbUp( xParam ) @@ -758,7 +758,7 @@ METHOD WvgCrt:lbUp( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:mbClick( xParam ) @@ -774,7 +774,7 @@ METHOD WvgCrt:mbClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:mbDblClick( xParam ) @@ -790,7 +790,7 @@ METHOD WvgCrt:mbDblClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:mbDown( xParam ) @@ -806,7 +806,7 @@ METHOD WvgCrt:mbDown( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:mbUp( xParam ) @@ -822,7 +822,7 @@ METHOD WvgCrt:mbUp( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:motion( xParam ) @@ -838,7 +838,7 @@ METHOD WvgCrt:motion( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:rbClick( xParam ) @@ -854,7 +854,7 @@ METHOD WvgCrt:rbClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:rbDblClick( xParam ) @@ -870,7 +870,7 @@ METHOD WvgCrt:rbDblClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:rbDown( xParam ) @@ -886,7 +886,7 @@ METHOD WvgCrt:rbDown( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:rbUp( xParam ) @@ -902,7 +902,7 @@ METHOD WvgCrt:rbUp( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:wheel( xParam ) @@ -918,9 +918,9 @@ METHOD WvgCrt:wheel( xParam ) RETURN Self -/*-*/ +// * Other Messages -/*-*/ +// METHOD WvgCrt:close( xParam ) @@ -936,7 +936,7 @@ METHOD WvgCrt:close( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:helpRequest( xParam ) @@ -952,7 +952,7 @@ METHOD WvgCrt:helpRequest( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:keyboard( xParam ) @@ -968,7 +968,7 @@ METHOD WvgCrt:keyboard( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:killDisplayFocus( xParam ) @@ -984,7 +984,7 @@ METHOD WvgCrt:killDisplayFocus( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:killInputFocus( xParam ) @@ -1000,7 +1000,7 @@ METHOD WvgCrt:killInputFocus( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:move( xParam ) @@ -1016,7 +1016,7 @@ METHOD WvgCrt:move( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:paint( xParam ) @@ -1032,7 +1032,7 @@ METHOD WvgCrt:paint( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:quit( xParam, xParam1 ) @@ -1048,7 +1048,7 @@ METHOD WvgCrt:quit( xParam, xParam1 ) RETURN Self -/*-*/ +// METHOD WvgCrt:resize( xParam ) @@ -1062,7 +1062,7 @@ METHOD WvgCrt:resize( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:setDisplayFocus( xParam ) @@ -1078,7 +1078,7 @@ METHOD WvgCrt:setDisplayFocus( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:setInputFocus( xParam ) @@ -1094,7 +1094,7 @@ METHOD WvgCrt:setInputFocus( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:dragEnter( xParam, xParam1 ) @@ -1110,7 +1110,7 @@ METHOD WvgCrt:dragEnter( xParam, xParam1 ) RETURN Self -/*-*/ +// METHOD WvgCrt:dragMotion( xParam ) @@ -1126,7 +1126,7 @@ METHOD WvgCrt:dragMotion( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:dragLeave( xParam ) @@ -1142,7 +1142,7 @@ METHOD WvgCrt:dragLeave( xParam ) RETURN Self -/*-*/ +// METHOD WvgCrt:dragDrop( xParam, xParam1 ) @@ -1158,4 +1158,4 @@ METHOD WvgCrt:dragDrop( xParam, xParam1 ) RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/dataref.prg b/harbour/contrib/gtwvg/dataref.prg index eb4be3f4d3..634597c1c9 100644 --- a/harbour/contrib/gtwvg/dataref.prg +++ b/harbour/contrib/gtwvg/dataref.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 06Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgDataRef @@ -101,13 +101,13 @@ CLASS WvgDataRef ENDCLASS -/*-*/ +// METHOD WvgDataRef:new() RETURN self -/*-*/ +// METHOD WvgDataRef:getData() @@ -145,7 +145,7 @@ METHOD WvgDataRef:getData() RETURN ::sl_editBuffer -/*-*/ +// METHOD WvgDataRef:setData( xValue, mp2 ) LOCAL s @@ -196,13 +196,13 @@ METHOD WvgDataRef:setData( xValue, mp2 ) RETURN ::sl_editBuffer -/*-*/ +// METHOD WvgDataRef:undo() RETURN .f. -/*-*/ +// METHOD WvgDataRef:validate( xParam ) @@ -214,4 +214,4 @@ METHOD WvgDataRef:validate( xParam ) RETURN .t. -/*-*/ +// diff --git a/harbour/contrib/gtwvg/dialog.prg b/harbour/contrib/gtwvg/dialog.prg index 3bd15662c9..cf90c81c3e 100644 --- a/harbour/contrib/gtwvg/dialog.prg +++ b/harbour/contrib/gtwvg/dialog.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 17Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgDialog FROM WvgWindow @@ -101,7 +101,7 @@ CLASS WvgDialog FROM WvgWindow ::aRect[ 3 ]-::aRect[ 1 ], ::aRect[ 4 ]-::aRect[ 2 ] } ENDCLASS -/*-*/ +// METHOD WvgDialog:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -116,7 +116,7 @@ METHOD WvgDialog:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) LOCAL oW @@ -171,11 +171,11 @@ METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::drawingArea := Self ENDIF - hb_gtInfo( HB_GTI_NOTIFIERBLOCK, {|nEvent, ...| ::notifier( nEvent, ... ) } ) + hb_gtInfo( HB_GTI_NOTIFIERBLOCK, {| nEvent, ... | ::notifier( nEvent, ... ) } ) RETURN Self -/*-*/ +// METHOD WvgDialog:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -183,7 +183,7 @@ METHOD WvgDialog:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgDialog:destroy() @@ -192,7 +192,7 @@ METHOD WvgDialog:destroy() ENDIF IF Len( ::aChildren ) > 0 - aeval( ::aChildren, {|o| o:destroy() } ) + aeval( ::aChildren, {| o | o:destroy() } ) ENDIF IF !empty( ::hBrushBG ) @@ -204,7 +204,7 @@ METHOD WvgDialog:destroy() RETURN Self -/*-*/ +// METHOD WvgDialog:setFrameState( nState ) LOCAL lSuccess := .f. @@ -224,7 +224,7 @@ METHOD WvgDialog:setFrameState( nState ) RETURN lSuccess -/*-*/ +// METHOD WvgDialog:getFrameState() @@ -237,7 +237,7 @@ METHOD WvgDialog:getFrameState() RETURN WVGDLG_FRAMESTAT_NORMALIZED -/*-*/ +// METHOD WvgDialog:menuBar() @@ -247,4 +247,4 @@ METHOD WvgDialog:menuBar() RETURN ::oMenu -/*-*/ +// diff --git a/harbour/contrib/gtwvg/drawarea.prg b/harbour/contrib/gtwvg/drawarea.prg index ab18a98da4..db9d284a6e 100644 --- a/harbour/contrib/gtwvg/drawarea.prg +++ b/harbour/contrib/gtwvg/drawarea.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 15Feb2009 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgDrawingArea INHERIT WvgWindow @@ -88,7 +88,7 @@ CLASS WvgDrawingArea INHERIT WvgWindow METHOD handleEvent( nMessage, aNM ) ENDCLASS -/*-*/ +// METHOD WvgDrawingArea:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -102,7 +102,7 @@ METHOD WvgDrawingArea:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgDrawingArea:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -121,7 +121,7 @@ METHOD WvgDrawingArea:create( oParent, oOwner, aPos, aSize, aPresParams, lVisibl RETURN Self -/*-*/ +// METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) @@ -130,7 +130,7 @@ METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, NIL, NIL, self ) ENDIF - aeval( ::aChildren, {|o| o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) + aeval( ::aChildren, {| o | o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) RETURN EVENT_HANDELLED CASE nMessage == HB_GTE_CTLCOLOR @@ -147,7 +147,7 @@ METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD destroy() CLASS WvgDrawingArea @@ -157,4 +157,4 @@ METHOD destroy() CLASS WvgDrawingArea RETURN NIL -/*-*/ +// diff --git a/harbour/contrib/gtwvg/genrc.prg b/harbour/contrib/gtwvg/genrc.prg index 17a59f231c..2fc63d1aa3 100644 --- a/harbour/contrib/gtwvg/genrc.prg +++ b/harbour/contrib/gtwvg/genrc.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// * * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 03Dec2011 * -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,11 +74,11 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// THREAD STATIC s_oCrt := NIL -/*-*/ +// EXIT PROCEDURE KillGTChildren() @@ -89,7 +89,7 @@ EXIT PROCEDURE KillGTChildren() RETURN -/*-*/ +// FUNCTION WvgSetAppWindow( oCrt ) LOCAL ooCrt := s_oCrt @@ -99,7 +99,7 @@ FUNCTION WvgSetAppWindow( oCrt ) s_oCrt := WvgCrt():new() s_oCrt:hWnd := Wvt_GetWindowHandle() s_oCrt:pWnd := Win_N2P( s_oCrt:hWnd ) - HB_GtInfo( HB_GTI_NOTIFIERBLOCKGUI, {|nEvent, ...| s_oCrt:notifier( nEvent, ... ) } ) + HB_GtInfo( HB_GTI_NOTIFIERBLOCKGUI, {| nEvent, ... | s_oCrt:notifier( nEvent, ... ) } ) s_oCrt:isGT := .T. RETURN s_oCrt ENDIF @@ -109,4 +109,4 @@ FUNCTION WvgSetAppWindow( oCrt ) RETURN ooCrt -/*-*/ +// diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 4c16f6f865..d01a0a9d70 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -4607,11 +4607,11 @@ static void hb_wvt_gtCreateToolTipWindow( PHB_GTWVT pWVT ) pWVT->hWndTT = hwndTT; } -/*-----------------------------------------------------------------------/ +/* * - * Exported functions for API calls + * Exported functions for API calls * -/-----------------------------------------------------------------------*/ + */ PHB_GTWVT hb_wvt_gtGetWVT( void ) { diff --git a/harbour/contrib/gtwvg/htmlview.prg b/harbour/contrib/gtwvg/htmlview.prg index 5d6092d7af..745bf541fc 100644 --- a/harbour/contrib/gtwvg/htmlview.prg +++ b/harbour/contrib/gtwvg/htmlview.prg @@ -50,9 +50,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -62,9 +62,9 @@ * Pritpal Bedi * 08Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -75,7 +75,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #define evBeforeNavigate 100 #define evNavigateComplete 101 @@ -92,7 +92,7 @@ #define evDocumentComplete 259 #define evNavigateError 271 -/*-*/ +// CLASS WvgHTMLViewer INHERIT WvgActiveXControl @@ -141,7 +141,7 @@ CLASS WvgHTMLViewer INHERIT WvgActiveXControl ENDCLASS -/*-*/ +// METHOD WvgHTMLViewer:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -151,7 +151,7 @@ METHOD WvgHTMLViewer:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -175,7 +175,7 @@ METHOD WvgHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:xBeforeNavigate( cURL, Flags, TFName, PData, Headers ) @@ -191,7 +191,7 @@ METHOD WvgHTMLViewer:xBeforeNavigate( cURL, Flags, TFName, PData, Headers ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:xStatusTextChange( cText ) @@ -201,7 +201,7 @@ METHOD WvgHTMLViewer:xStatusTextChange( cText ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:xNavigateComplete( cURL ) @@ -211,7 +211,7 @@ METHOD WvgHTMLViewer:xNavigateComplete( cURL ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:xProgressChange( nProgress, nProgMax ) @@ -221,7 +221,7 @@ METHOD WvgHTMLViewer:xProgressChange( nProgress, nProgMax ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:xTitleChange( cTitle ) @@ -231,7 +231,7 @@ METHOD WvgHTMLViewer:xTitleChange( cTitle ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:xDocumentComplete( cURI ) @@ -241,7 +241,7 @@ METHOD WvgHTMLViewer:xDocumentComplete( cURI ) RETURN Self -/*-*/ +// METHOD WvgHTMLViewer:setHTML( cHTML ) @@ -250,4 +250,4 @@ METHOD WvgHTMLViewer:setHTML( cHTML ) RETURN self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/listbox.prg b/harbour/contrib/gtwvg/listbox.prg index e72b2e9e9f..bb0f2c7af4 100644 --- a/harbour/contrib/gtwvg/listbox.prg +++ b/harbour/contrib/gtwvg/listbox.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 26Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgListBox INHERIT WvgWindow, WvgDataRef @@ -139,7 +139,7 @@ CLASS WvgListBox INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD WvgListBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -152,7 +152,7 @@ METHOD WvgListBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgListBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -182,7 +182,7 @@ METHOD WvgListBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgListBox:handleEvent( nMessage, aNM ) @@ -304,7 +304,7 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgListBox:clear() @@ -312,13 +312,13 @@ METHOD WvgListBox:clear() RETURN Self -/*-*/ +// METHOD WvgListBox:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgListBox:destroy() ::WvgWindow:destroy() diff --git a/harbour/contrib/gtwvg/menubar.prg b/harbour/contrib/gtwvg/menubar.prg index ce37eb3775..77ce4804f0 100644 --- a/harbour/contrib/gtwvg/menubar.prg +++ b/harbour/contrib/gtwvg/menubar.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 22Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS wvgMenuBar INHERIT wvgWindow @@ -137,7 +137,7 @@ CLASS wvgMenuBar INHERIT wvgWindow ENDCLASS -/*-*/ +// METHOD WvgMenuBar:new( oParent, aPresParams, lVisible ) @@ -153,7 +153,7 @@ METHOD WvgMenuBar:new( oParent, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) @@ -194,7 +194,7 @@ METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:configure( oParent, aPresParams, lVisible ) @@ -208,7 +208,7 @@ METHOD WvgMenuBar:configure( oParent, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:destroy() @@ -226,7 +226,7 @@ METHOD WvgMenuBar:destroy() RETURN .T. -/*-*/ +// METHOD WvgMenuBar:delAllItems() LOCAL lResult:= .T., nItems @@ -239,7 +239,7 @@ METHOD WvgMenuBar:delAllItems() RETURN lResult -/*-*/ +// METHOD WvgMenuBar:delItem( nItemNum ) LOCAL lResult:= .F. @@ -261,7 +261,7 @@ METHOD WvgMenuBar:delItem( nItemNum ) RETURN lResult -/*-*/ +// /* * { xCaption, bAction, nStyle, nAttrb } */ @@ -283,7 +283,7 @@ METHOD WvgMenuBar:addItem( aItem, p2, p3, p4 ) RETURN ::putItem( { xCaption, bAction, nStyle, nAttrib }, -1, .t. ) -/*-*/ +// METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) LOCAL nItemIndex, cCaption @@ -364,7 +364,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) RETURN nItemIndex -/*-*/ +// METHOD WvgMenuBar:findMenuItemById( nId ) LOCAL x, aResult :={} @@ -386,7 +386,7 @@ METHOD WvgMenuBar:findMenuItemById( nId ) RETURN aResult -/*-*/ +// METHOD WvgMenuBar:findMenuPosById( nId ) LOCAL x, nPos @@ -408,7 +408,7 @@ METHOD WvgMenuBar:findMenuPosById( nId ) RETURN nPos -/*-*/ +// METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) LOCAL nRet := -1 @@ -421,7 +421,7 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) RETURN iif( nRet == -1, .F., .T. ) -/*-*/ +// METHOD WvgMenuBar:enableItem( nItemNum ) LOCAL lSuccess := .f. @@ -432,7 +432,7 @@ METHOD WvgMenuBar:enableItem( nItemNum ) RETURN lSuccess -/*-*/ +// METHOD WvgMenuBar:disableItem( nItemNum ) LOCAL lSuccess := .f. @@ -443,7 +443,7 @@ METHOD WvgMenuBar:disableItem( nItemNum ) RETURN lSuccess -/*-*/ +// METHOD WvgMenuBar:getItem( nItemNum ) @@ -453,7 +453,7 @@ METHOD WvgMenuBar:getItem( nItemNum ) RETURN NIL -/*-*/ +// METHOD WvgMenuBar:insItem( nItemNum, aItem ) @@ -461,19 +461,19 @@ METHOD WvgMenuBar:insItem( nItemNum, aItem ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:isItemChecked( nItemNum ) RETURN WVG_IsMenuItemChecked( ::hMenu, nItemNum-1 ) -/*-*/ +// METHOD WvgMenuBar:isItemEnabled( nItemNum ) RETURN WVG_IsMenuItemEnabled( ::hMenu, nItemNum-1 ) -/*-*/ +// METHOD WvgMenuBar:selectItem( nItemNum ) @@ -483,15 +483,15 @@ METHOD WvgMenuBar:selectItem( nItemNum ) RETURN .t. -/*-*/ +// METHOD WvgMenuBar:setItem( nItemNum, aItem ) RETURN ::putItem( aItem, nItemNum, .f. ) -/*-*/ +// /* Callback Methods */ -/*-*/ +// METHOD WvgMenuBar:beginMenu( xParam ) @@ -502,7 +502,7 @@ METHOD WvgMenuBar:beginMenu( xParam ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:endMenu( xParam ) @@ -513,7 +513,7 @@ METHOD WvgMenuBar:endMenu( xParam ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:itemMarked( xParam ) @@ -524,7 +524,7 @@ METHOD WvgMenuBar:itemMarked( xParam ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:itemSelected( xParam ) @@ -535,7 +535,7 @@ METHOD WvgMenuBar:itemSelected( xParam ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:drawItem( xParam ) @@ -546,7 +546,7 @@ METHOD WvgMenuBar:drawItem( xParam ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:measureItem( xParam ) @@ -557,7 +557,7 @@ METHOD WvgMenuBar:measureItem( xParam ) RETURN Self -/*-*/ +// METHOD WvgMenuBar:onMenuKey( xParam ) @@ -568,15 +568,15 @@ METHOD WvgMenuBar:onMenuKey( xParam ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Xbase++ compatible xbpMenu class */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS wvgMenu INHERIT wvgMenuBar @@ -591,7 +591,7 @@ CLASS wvgMenu INHERIT wvgMenuBar ENDCLASS -/*-*/ +// METHOD WvgMenu:new( oParent, aPresParams, lVisible ) @@ -605,7 +605,7 @@ METHOD WvgMenu:new( oParent, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMenu:create( oParent, aPresParams, lVisible ) @@ -623,19 +623,19 @@ METHOD WvgMenu:create( oParent, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMenu:getTitle() RETURN ::title -/*-*/ +// METHOD WvgMenu:setTitle( cTitle ) RETURN ::title := cTitle -/*-*/ +// METHOD WvgMenu:popUp( oXbp, aPos, nDefaultItem, nControl ) LOCAL nCmd, aMenuItem @@ -652,4 +652,4 @@ METHOD WvgMenu:popUp( oXbp, aPos, nDefaultItem, nControl ) RETURN 0 -/*-*/ +// diff --git a/harbour/contrib/gtwvg/mle.prg b/harbour/contrib/gtwvg/mle.prg index a63882fb4c..bec3cb6a44 100644 --- a/harbour/contrib/gtwvg/mle.prg +++ b/harbour/contrib/gtwvg/mle.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 07Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,13 +74,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS WvgMLE INHERIT WvgWindow, WvgDataRef @@ -133,7 +133,7 @@ CLASS WvgMLE INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD WvgMLE:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -146,7 +146,7 @@ METHOD WvgMLE:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMLE:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -187,7 +187,7 @@ METHOD WvgMLE:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgMLE:handleEvent( nMessage, aNM ) @@ -271,7 +271,7 @@ METHOD WvgMLE:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgMLE:destroy() @@ -281,7 +281,7 @@ METHOD WvgMLE:destroy() RETURN NIL -/*-*/ +// METHOD WvgMLE:changed( lChanged ) LOCAL lChg := ::sendMessage( EM_GETMODIFY, 0, 0 ) @@ -292,7 +292,7 @@ METHOD WvgMLE:changed( lChanged ) RETURN lChg -/*-*/ +// METHOD WvgMLE:clear() LOCAL cText := ::getData() @@ -301,7 +301,7 @@ METHOD WvgMLE:clear() RETURN len( cText ) -/*-*/ +// METHOD WvgMLE:copyMarked() LOCAL n, nB, nE @@ -316,7 +316,7 @@ METHOD WvgMLE:copyMarked() RETURN n -/*-*/ +// METHOD WvgMLE:cutMarked() LOCAL n, nB, nE, cText @@ -332,6 +332,6 @@ METHOD WvgMLE:cutMarked() RETURN n -/*-*/ +// diff --git a/harbour/contrib/gtwvg/paint.prg b/harbour/contrib/gtwvg/paint.prg index 055c577d1f..29f809b3d3 100644 --- a/harbour/contrib/gtwvg/paint.prg +++ b/harbour/contrib/gtwvg/paint.prg @@ -47,26 +47,26 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * WvtPaint.prg * * Routines to manage Wvt*Classes Gui Painting */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "wvtwin.ch" #include "common.ch" -/*-*/ +// thread static t_paint_:= { { "", {} } } -/*-*/ +// /* * This function must have to be defined in your appls */ @@ -78,7 +78,7 @@ function Wvt_Paint() return nil #endif -/*-*/ +// function WvtPaintObjects() LOCAL i, lExe, nLeft, nRight, b, tlbr_, aBlocks, nBlocks @@ -140,7 +140,7 @@ function WvtPaintObjects() return 0 -/*-*/ +// function WvtSetPaint( a_ ) local o @@ -158,14 +158,14 @@ function WvtSetPaint( a_ ) return o -/*-*/ +// function wvg_SetPaint( cID, nAction, xData, aAttr ) local n, n1, oldData if xData != nil - if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 - if ( n1 := ascan( t_paint_[ n,2 ], {|e_| e_[ 1 ] == nAction } ) ) > 0 + if ( n := ascan( t_paint_, {| e_ | e_[ 1 ] == cID } ) ) > 0 + if ( n1 := ascan( t_paint_[ n, 2 ], {| e_ | e_[ 1 ] == nAction } ) ) > 0 oldData := t_paint_[ n,2,n1,2 ] t_paint_[ n,2,n1,2 ] := xData t_paint_[ n,2,n1,3 ] := aAttr @@ -181,24 +181,24 @@ function wvg_SetPaint( cID, nAction, xData, aAttr ) return oldData -/*-*/ +// function wvg_GetPaint( cID ) local n - if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 + if ( n := ascan( t_paint_, {| e_ | e_[ 1 ] == cID } ) ) > 0 return t_paint_[ n,2 ] endif return {} -/*-*/ +// function wvg_DelPaint( cID, nAction ) local xData, n1, n - if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 - if ( n1 := ascan( t_paint_[ n,2 ], {|e_| e_[ 1 ] == nAction } ) ) > 0 + if ( n := ascan( t_paint_, {| e_ | e_[ 1 ] == cID } ) ) > 0 + if ( n1 := ascan( t_paint_[ n, 2 ], {| e_ | e_[ 1 ] == nAction } ) ) > 0 xData := t_paint_[ n,2,n1,2 ] t_paint_[ n,2,n1,2 ] := {|| .t. } endif @@ -206,14 +206,14 @@ function wvg_DelPaint( cID, nAction ) return xData -/*-*/ +// function wvg_PurgePaint( cID,lDummy ) local n, aPaint DEFAULT lDummy TO .f. - if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 + if ( n := ascan( t_paint_, {| e_ | e_[ 1 ] == cID } ) ) > 0 aPaint := t_paint_[ n ] ADel( t_paint_, n ) aSize( t_paint_, len( t_paint_ ) - 1 ) @@ -225,14 +225,14 @@ function wvg_PurgePaint( cID,lDummy ) return aPaint -/*-*/ +// function wvg_InsertPaint( cID, aPaint, lSet ) local n DEFAULT lSet TO .f. - if ( n := ascan( t_paint_, { |e_| e_[ 1 ] == cID } ) ) > 0 + if ( n := ascan( t_paint_, {| e_ | e_[ 1 ] == cID } ) ) > 0 t_paint_[ n ] := aPaint else aadd( t_paint_, aPaint ) @@ -244,17 +244,17 @@ function wvg_InsertPaint( cID, aPaint, lSet ) return nil -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * RunTime Dialog Generation Routines * * Courtesy What32.lib */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* nMode : 0 == Rows/cols - DEFAULT 1 == DlagUnits as from any standard dialog definition */ FUNCTION Wvt_SetDlgCoMode( nMode ) LOCAL nOldMode @@ -268,7 +268,7 @@ FUNCTION Wvt_SetDlgCoMode( nMode ) RETURN nOldMode -/*-*/ +// FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle, ; @@ -350,7 +350,7 @@ FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle Return aDlg -/*-*/ +// Function Wvt_AddDlgItem( aDlg, nTop, nLeft, nRows, nCols, aOffSet,; cnId, cnDlgClass, nStyle, cText, nHelpId, nExStyle ) @@ -414,7 +414,7 @@ Function Wvt_AddDlgItem( aDlg, nTop, nLeft, nRows, nCols, aOffSet,; Return aDlg -/*-*/ +// Function Wvt_CreateDialog( acnDlg, lOnTop, cbDlgProc, ncIcon, nTimerTicks, hMenu ) LOCAL hDlg, cType, xTemplate, nDlgMode @@ -456,7 +456,7 @@ Function Wvt_CreateDialog( acnDlg, lOnTop, cbDlgProc, ncIcon, nTimerTicks, hMenu Return hDlg -/*-*/ +// Function Wvt_DialogBox( acnDlg, cbDlgProc, hWndParent ) LOCAL nResult, cType, xTemplate, nDlgMode @@ -482,7 +482,7 @@ Function Wvt_DialogBox( acnDlg, cbDlgProc, hWndParent ) Return nResult -/*-*/ +// /* Wvt_GetOpenFileName( hWnd, @cPath, cTitle, aFilter, nFlags, cInitDir, cDefExt, nIndex ) @@ -526,7 +526,7 @@ FUNCTION WVT_GetOpenFileName( hWnd, cPath, cTitle, acFilter, nFlags, cInitDir, c RETURN xRet -/*-*/ +// /* Wvt_GetSaveFileName( hWnd, cDefFile, cTitle, acFilter, nFlags, cInitDir, cDefExt, @nFilterIndex ) @@ -569,32 +569,32 @@ FUNCTION WVT_GetSaveFileName( hWnd, cDefName, cTitle, acFilter, nFlags, cInitDir RETURN xRet -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * C Functions to PRG Ports */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbgtinfo.ch" #include "hbgtwvg.ch" -/*-*/ +// FUNCTION Wvt_SetTitle( cTitle ) RETURN Hb_GtInfo( HB_GTI_WINTITLE, cTitle ) -/*-*/ +// FUNCTION Wvt_GetTitle() RETURN Hb_GtInfo( HB_GTI_WINTITLE ) -/*-*/ +// FUNCTION Wvt_SetIcon( ncIconRes, cIconName ) @@ -611,7 +611,7 @@ FUNCTION Wvt_SetIcon( ncIconRes, cIconName ) RETURN NIL -/*-*/ +// FUNCTION Wvt_SetFont( cFontName, nSize, nWidth, nWeight, nQuality ) @@ -623,31 +623,31 @@ FUNCTION Wvt_SetFont( cFontName, nSize, nWidth, nWeight, nQuality ) RETURN Hb_GtInfo( HB_GTI_SETFONT, { cFontName, nSize, nWidth, nWeight, nQuality } ) -/*-*/ +// FUNCTION Wvt_SetCodePage( nCodePage ) RETURN Hb_GtInfo( HB_GTI_CODEPAGE, nCodePage ) -/*-*/ +// FUNCTION Wvt_GetPalette() RETURN Hb_GtInfo( HB_GTI_PALETTE ) -/*-*/ +// FUNCTION Wvt_SetPalette( aRGB ) RETURN Hb_GtInfo( HB_GTI_PALETTE, aRGB ) -/*-*/ +// FUNCTION Wvt_GetRGBColor( nIndex ) RETURN Hb_GtInfo( HB_GTI_PALETTE, nIndex ) -/*-*/ +// #define BLACK RGB( 0x0 ,0x0 ,0x0 ) #define BLUE RGB( 0x0 ,0x0 ,0x85 ) #define GREEN RGB( 0x0 ,0x85,0x0 ) @@ -688,7 +688,7 @@ FUNCTION Wvt_GetRGBColorByString( cColor, nForeBack ) s := strtran( s, "*" ) s := strtran( s, "+" ) ENDIF - nIndex := ascan( a_, {|e| e == s } ) + nIndex := ascan( a_, {| e | e == s } ) IF nIndex > 0 IF lEnh nIndex += 8 @@ -699,31 +699,31 @@ FUNCTION Wvt_GetRGBColorByString( cColor, nForeBack ) RETURN Hb_GtInfo( HB_GTI_PALETTE, nIndex ) -/*-*/ +// FUNCTION Wvt_SetAltF4Close( lSetClose ) RETURN Hb_GtInfo( HB_GTI_CLOSABLE, lSetClose ) -/*-*/ +// FUNCTION Wvt_GetScreenWidth() RETURN Hb_GtInfo( HB_GTI_DESKTOPWIDTH ) -/*-*/ +// FUNCTION Wvt_GetScreenHeight() RETURN Hb_GtInfo( HB_GTI_DESKTOPHEIGHT ) -/*-*/ +// FUNCTION Wvt_GetWindowHandle() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WINDOWHANDLE ) -/*-*/ +// FUNCTION Wvt_CenterWindow( lCenter, lRePaint ) @@ -732,7 +732,7 @@ FUNCTION Wvt_CenterWindow( lCenter, lRePaint ) RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_CENTERWINDOW, { lCenter, lRePaint } ) -/*-*/ +// FUNCTION Wvt_WindowCentre( lCenter, lRePaint ) @@ -741,7 +741,7 @@ FUNCTION Wvt_WindowCentre( lCenter, lRePaint ) RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_CENTERWINDOW, { lCenter, lRePaint } ) -/*-*/ +// FUNCTION Wvt_ProcessMessages() @@ -749,7 +749,7 @@ FUNCTION Wvt_ProcessMessages() RETURN .t. -/*-*/ +// FUNCTION Wvt_KeyBoard( nKey ) @@ -757,19 +757,19 @@ FUNCTION Wvt_KeyBoard( nKey ) RETURN NIL -/*-*/ +// FUNCTION Wvt_GetClipboard() RETURN Hb_GtInfo( HB_GTI_CLIPBOARDDATA ) -/*-*/ +// FUNCTION Wvt_SetClipboard( cText ) RETURN Hb_GtInfo( HB_GTI_CLIPBOARDDATA, cText ) -/*-*/ +// FUNCTION Wvt_PasteFromClipboard() Local cText, nLen, i @@ -783,76 +783,76 @@ FUNCTION Wvt_PasteFromClipboard() RETURN NIL -/*-*/ +// FUNCTION Wvt_ResetWindow() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_RESETWINDOW ) -/*-*/ +// FUNCTION Wvt_SetTimer( nTimerID, nMiliSeconds ) RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_SETTIMER, { nTimerID, nMiliSeconds } ) -/*-*/ +// FUNCTION Wvt_KillTimer( nTimerID ) RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_KILLTIMER, nTimerID ) -/*-*/ +// FUNCTION Wvt_SetOnTop() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WNDSTATE, HB_GTS_WS_SETONTOP ) -/*-*/ +// FUNCTION Wvt_SetAsNormal() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WNDSTATE, HB_GTS_WS_SETASNORMAL ) -/*-*/ +// FUNCTION Wvt_Minimize() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WNDSTATE, HB_GTS_WS_MINIMIZED ) -/*-*/ +// FUNCTION Wvt_Maximize() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WNDSTATE, HB_GTS_WS_MAXIMIZED ) -/*-*/ +// FUNCTION Wvt_Hide() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WNDSTATE, HB_GTS_WS_HIDDEN ) -/*-*/ +// FUNCTION Wvt_Show() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_WNDSTATE, HB_GTS_WS_NORMAL ) -/*-*/ +// FUNCTION Wvt_SetWindowPos( nX, nY ) RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_SETPOSITION, { nX, nY } ) -/*-*/ +// FUNCTION Wvt_ShowWindow( nState ) RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_SHOWWINDOW, nState ) -/*-*/ +// FUNCTION Wvt_Update() RETURN Hb_GtInfo( HB_GTI_SPEC, HB_GTS_UPDATEWINDOW ) -/*-*/ +// diff --git a/harbour/contrib/gtwvg/parthdlr.prg b/harbour/contrib/gtwvg/parthdlr.prg index f4a693228c..03dd26f20f 100644 --- a/harbour/contrib/gtwvg/parthdlr.prg +++ b/harbour/contrib/gtwvg/parthdlr.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 08Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgPartHandler @@ -111,7 +111,7 @@ CLASS WvgPartHandler ENDCLASS -/*-*/ +// METHOD WvgPartHandler:new( oParent, oOwner ) @@ -120,7 +120,7 @@ METHOD WvgPartHandler:new( oParent, oOwner ) RETURN Self -/*-*/ +// METHOD WvgPartHandler:create( oParent, oOwner ) @@ -132,7 +132,7 @@ METHOD WvgPartHandler:create( oParent, oOwner ) RETURN Self -/*-*/ +// METHOD WvgPartHandler:configure( oParent, oOwner ) @@ -144,7 +144,7 @@ METHOD WvgPartHandler:configure( oParent, oOwner ) RETURN Self -/*-*/ +// METHOD WvgPartHandler:destroy() @@ -155,7 +155,7 @@ METHOD WvgPartHandler:destroy() RETURN Self -/*-*/ +// METHOD WvgPartHandler:handleEvent( hEvent, mp1, mp2 ) @@ -165,13 +165,13 @@ METHOD WvgPartHandler:handleEvent( hEvent, mp1, mp2 ) RETURN Self -/*-*/ +// METHOD WvgPartHandler:status() RETURN ::nStatus -/*-*/ +// METHOD WvgPartHandler:addChild( oWvg ) @@ -180,7 +180,7 @@ METHOD WvgPartHandler:addChild( oWvg ) RETURN Self -/*-*/ +// METHOD WvgPartHandler:childFromName( nNameId ) LOCAL i, oWvg @@ -193,29 +193,29 @@ METHOD WvgPartHandler:childFromName( nNameId ) RETURN oWvg -/*-*/ +// METHOD WvgPartHandler:childList() RETURN ::aChildren -/*-*/ +// METHOD WvgPartHandler:removeChild( oChild ) LOCAL n - IF ( n := ascan( ::aChildren, {|o| o == oChild } ) ) > 0 + IF ( n := ascan( ::aChildren, {| o | o == oChild } ) ) > 0 hb_aDel( ::aChildren, n, .t. ) ENDIF RETURN Self -/*-*/ +// METHOD WvgPartHandler:delChild( oWvg ) LOCAL n - n := ascan( ::aChildren, {|o| o == oWvg } ) + n := ascan( ::aChildren, {| o | o == oWvg } ) IF n > 0 oWvg:destroy() adel( ::aChildren, n ) @@ -224,7 +224,7 @@ METHOD WvgPartHandler:delChild( oWvg ) RETURN Self -/*-*/ +// METHOD WvgPartHandler:setName( nNameId ) LOCAL nOldNameId := ::nNameId @@ -235,7 +235,7 @@ METHOD WvgPartHandler:setName( nNameId ) RETURN nOldNameId -/*-*/ +// METHOD WvgPartHandler:setOwner( oWvg ) LOCAL oOldXbp := ::oOwner @@ -246,7 +246,7 @@ METHOD WvgPartHandler:setOwner( oWvg ) RETURN oOldXbp -/*-*/ +// METHOD WvgPartHandler:setParent( oWvg ) LOCAL oOldXbp := ::oParent @@ -257,7 +257,7 @@ METHOD WvgPartHandler:setParent( oWvg ) RETURN oOldXbp -/*-*/ +// METHOD WvgPartHandler:notifierBlock( ... ) LOCAL a_:= hb_AParams() @@ -272,7 +272,7 @@ METHOD WvgPartHandler:notifierBlock( ... ) RETURN NIL -/*-*/ +// /* This will be called by the WvgCRT() console FOR various events TO be propogated TO child controls @@ -369,7 +369,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) ENDIF CASE nEvent == HB_GTE_SETFOCUS - /* aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) */ + /* aeval( ::aChildren, {| o | WVG_InvalidateRect( o:hWnd ) } ) */ IF HB_ISBLOCK( ::sl_setInputFocus ) eval( ::sl_setInputFocus, NIL, NIL, Self ) @@ -383,13 +383,13 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) ::lHasInputFocus := .f. CASE nEvent == HB_GTE_PAINT - /* aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) */ + /* aeval( ::aChildren, {| o | WVG_InvalidateRect( o:hWnd ) } ) */ CASE nEvent == HB_GTE_GUIPARTS /* Eventally every window be checked if it falls within returned rectangle or not * then it will avoid a lot of flickering */ - aeval( ::aChildren, {|o| WVG_InvalidateRect( o:hWnd ) } ) + aeval( ::aChildren, {| o | WVG_InvalidateRect( o:hWnd ) } ) CASE nEvent == HB_GTE_CLOSE IF HB_ISBLOCK( ::close ) @@ -425,13 +425,13 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) CASE nEvent == HB_GTE_NOTIFY nCtrlID := xParams[ 1 ] - IF ( nIndex := ascan( ::aChildren, {|o| o:nID == nCtrlID } ) ) > 0 + IF ( nIndex := ascan( ::aChildren, {| o | o:nID == nCtrlID } ) ) > 0 RETURN ::aChildren[ nIndex ]:handleEvent( HB_GTE_NOTIFY, xParams ) ENDIF CASE nEvent == HB_GTE_COMMAND nCtrlID := xParams[ 2 ] - IF ( nIndex := ascan( ::aChildren, {|o| o:nID == nCtrlID } ) ) > 0 + IF ( nIndex := ascan( ::aChildren, {| o | o:nID == nCtrlID } ) ) > 0 RETURN ::aChildren[ nIndex ]:handleEvent( HB_GTE_COMMAND, xParams ) ENDIF @@ -470,7 +470,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) IF HB_ISBLOCK( ::sl_resize ) eval( ::sl_resize, { xParams[ 1 ], xParams[ 2 ] }, { xParams[ 3 ], xParams[ 4 ] }, Self ) ENDIF - aeval( ::aChildren, {|o| o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) + aeval( ::aChildren, {| o | o:handleEvent( HB_GTE_RESIZED, { 0, 0, 0, 0, 0 } ) } ) CASE nEvent == HB_GTE_KEYTOITEM IF xParams[ 3 ] == ::hWnd @@ -486,7 +486,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) RETURN nReturn -/*-*/ +// /* This will be called if a control is assigned its own WndProc via ::SetWindowProcCallback() */ @@ -520,7 +520,7 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) ENDIF RETURN 0 ELSE - IF ( nObj := ascan( ::aChildren, {|o| o:nID == nCtrlID } ) ) > 0 + IF ( nObj := ascan( ::aChildren, {| o | o:nID == nCtrlID } ) ) > 0 nReturn := ::aChildren[ nObj ]:handleEvent( HB_GTE_COMMAND, { nNotifctn, nCtrlID, hWndCtrl } ) IF HB_ISNUMERIC( nReturn ) .AND. nReturn == 0 RETURN 0 @@ -613,4 +613,4 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) RETURN WVG_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) -/*-*/ +// diff --git a/harbour/contrib/gtwvg/pushbut.prg b/harbour/contrib/gtwvg/pushbut.prg index 0f5c09a78f..9acc681a3e 100644 --- a/harbour/contrib/gtwvg/pushbut.prg +++ b/harbour/contrib/gtwvg/pushbut.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 26Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgPushButton INHERIT WvgWindow @@ -102,7 +102,7 @@ CLASS WvgPushButton INHERIT WvgWindow ENDCLASS -/*-*/ +// METHOD WvgPushButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -114,7 +114,7 @@ METHOD WvgPushButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -149,7 +149,7 @@ METHOD WvgPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgPushButton:handleEvent( nMessage, aNM ) @@ -204,19 +204,19 @@ METHOD WvgPushButton:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgPushButton:destroy() ::wvgWindow:destroy() RETURN NIL -/*-*/ +// METHOD WvgPushButton:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgPushButton:setCaption( xCaption, cDll ) @@ -241,7 +241,7 @@ METHOD WvgPushButton:setCaption( xCaption, cDll ) RETURN Self -/*-*/ +// METHOD WvgPushButton:activate( xParam ) @@ -251,7 +251,7 @@ METHOD WvgPushButton:activate( xParam ) RETURN Self -/*-*/ +// METHOD WvgPushButton:draw( xParam ) diff --git a/harbour/contrib/gtwvg/radiobut.prg b/harbour/contrib/gtwvg/radiobut.prg index dbd25319f5..9706c654e5 100644 --- a/harbour/contrib/gtwvg/radiobut.prg +++ b/harbour/contrib/gtwvg/radiobut.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 06Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,13 +74,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef @@ -102,7 +102,7 @@ CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadioButton @@ -114,7 +114,7 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadio RETURN Self -/*-*/ +// METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadioButton @@ -138,7 +138,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRa RETURN Self -/*-*/ +// METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton @@ -161,7 +161,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton RETURN 1 -/*-*/ +// METHOD destroy() CLASS WvgRadioButton @@ -171,7 +171,7 @@ METHOD destroy() CLASS WvgRadioButton RETURN NIL -/*-*/ +// METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadioButton @@ -179,7 +179,7 @@ METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS Wv RETURN Self -/*-*/ +// METHOD setCaption( xCaption ) CLASS WvgRadioButton @@ -190,4 +190,4 @@ METHOD setCaption( xCaption ) CLASS WvgRadioButton RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/scrollbr.prg b/harbour/contrib/gtwvg/scrollbr.prg index 1499171dbc..66ea574c9b 100644 --- a/harbour/contrib/gtwvg/scrollbr.prg +++ b/harbour/contrib/gtwvg/scrollbr.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 17Feb2009 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #if 0 #include "xhb.ch" @@ -114,7 +114,7 @@ typedef struct tagRECT { ; } RECT #endif -/*-*/ +// CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef @@ -141,7 +141,7 @@ CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgScrollBar @@ -153,7 +153,7 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgScrol RETURN Self -/*-*/ +// METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgScrollBar @@ -191,7 +191,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSc RETURN Self -/*-*/ +// METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar LOCAL nScrMsg, nScrPos, nCommand @@ -356,7 +356,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD destroy() CLASS WvgScrollBar @@ -366,7 +366,7 @@ METHOD destroy() CLASS WvgScrollBar RETURN NIL -/*-*/ +// METHOD scroll( xParam ) CLASS WvgScrollBar @@ -376,7 +376,7 @@ METHOD scroll( xParam ) CLASS WvgScrollBar RETURN self -/*-*/ +// METHOD setRange( aRange ) CLASS WvgScrollBar LOCAL aOldRange, nMin, nMax @@ -393,14 +393,14 @@ METHOD setRange( aRange ) CLASS WvgScrollBar RETURN aOldRange -/*-*/ +// METHOD setScrollBoxSize( nUnits ) CLASS WvgScrollBar LOCAL nOldUnits := nUnits RETURN nOldUnits -/*-*/ +// #if 0 Scroll Bar @@ -668,4 +668,4 @@ by the x, y, nWidth, and nHeight parameters of CreateWindowEx. #endif -/*-*/ +// diff --git a/harbour/contrib/gtwvg/sle.prg b/harbour/contrib/gtwvg/sle.prg index c12f4d1465..97173ce777 100644 --- a/harbour/contrib/gtwvg/sle.prg +++ b/harbour/contrib/gtwvg/sle.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 07Dec2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgSLE INHERIT WvgWindow, WvgDataRef @@ -121,7 +121,7 @@ CLASS WvgSLE INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSLE @@ -133,7 +133,7 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSLE RETURN Self -/*-*/ +// METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSLE LOCAL es_:= { ES_LEFT, ES_RIGHT, ES_CENTER } @@ -178,7 +178,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSL RETURN Self -/*-*/ +// METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE @@ -256,7 +256,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD destroy() CLASS WvgSLE @@ -266,7 +266,7 @@ METHOD destroy() CLASS WvgSLE RETURN NIL -/*-*/ +// METHOD WvgSLE:changed( lChanged ) LOCAL lChg := ::sendMessage( EM_GETMODIFY, 0, 0 ) @@ -277,7 +277,7 @@ METHOD WvgSLE:changed( lChanged ) RETURN lChg -/*-*/ +// METHOD WvgSLE:clear() LOCAL cText := ::getData() @@ -286,7 +286,7 @@ METHOD WvgSLE:clear() RETURN len( cText ) -/*-*/ +// METHOD WvgSLE:copyMarked() LOCAL n, nB, nE @@ -301,7 +301,7 @@ METHOD WvgSLE:copyMarked() RETURN n -/*-*/ +// METHOD WvgSLE:cutMarked() LOCAL n, nB, nE, cText @@ -317,7 +317,7 @@ METHOD WvgSLE:cutMarked() RETURN n -/*-*/ +// METHOD WvgSLE:returnPressed( ... ) LOCAL a_:= hb_aParams() @@ -328,4 +328,4 @@ METHOD WvgSLE:returnPressed( ... ) ENDIF RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/statbar.prg b/harbour/contrib/gtwvg/statbar.prg index 351aa113c1..216d0707ce 100644 --- a/harbour/contrib/gtwvg/statbar.prg +++ b/harbour/contrib/gtwvg/statbar.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 25Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,13 +74,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */ @@ -106,7 +106,7 @@ CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */ ENDCLASS -/*-*/ +// METHOD WvgStatusBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -118,7 +118,7 @@ METHOD WvgStatusBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgStatusBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -142,7 +142,7 @@ METHOD WvgStatusBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgStatusBar:handleEvent( nMessage, aNM ) LOCAL nHandled := 1 @@ -197,7 +197,7 @@ METHOD WvgStatusBar:handleEvent( nMessage, aNM ) RETURN nHandled -/*-*/ +// METHOD WvgStatusBar:destroy() LOCAL i, nItems @@ -214,7 +214,7 @@ METHOD WvgStatusBar:destroy() RETURN NIL -/*-*/ +// METHOD WvgStatusBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -222,7 +222,7 @@ METHOD WvgStatusBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisib RETURN Self -/*-*/ +// METHOD WvgStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) LOCAL oPanel, lSuccess @@ -247,13 +247,13 @@ METHOD WvgStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) RETURN oPanel -/*-*/ +// METHOD WvgStatusBar:delItem( nItemORcKey ) LOCAL nIndex := 0 IF HB_ISNUMERIC( nItemORcKey ) - nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) + nIndex := ascan( ::aItems, {| o | o:key == nItemORcKey } ) ELSEIF HB_ISNUMERIC( nItemORcKey ) nIndex := nItemORcKey ENDIF @@ -266,13 +266,13 @@ METHOD WvgStatusBar:delItem( nItemORcKey ) RETURN Self -/*-*/ +// METHOD WvgStatusBar:getItem( nItemORcKey ) LOCAL nIndex := 0, oPanel IF HB_ISSTRING( nItemORcKey ) - nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) + nIndex := ascan( ::aItems, {| o | o:key == nItemORcKey } ) ELSEIF HB_ISNUMERIC( nItemORcKey ) nIndex := nItemORcKey @@ -285,7 +285,7 @@ METHOD WvgStatusBar:getItem( nItemORcKey ) RETURN oPanel -/*-*/ +// METHOD WvgStatusBar:clear() LOCAL i @@ -298,7 +298,7 @@ METHOD WvgStatusBar:clear() RETURN Self -/*-*/ +// METHOD WvgStatusBar:panelClick( xParam ) @@ -308,7 +308,7 @@ METHOD WvgStatusBar:panelClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgStatusBar:panelDblClick( xParam ) @@ -318,15 +318,15 @@ METHOD WvgStatusBar:panelDblClick( xParam ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * WvgToolbarButton() Class compatible with XbpToolbarButton() */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvgStatusBarPanel @@ -351,7 +351,7 @@ CLASS WvgStatusBarPanel DATA oParent ENDCLASS -/*-*/ +// METHOD WvgStatusBarPanel:new( cCaption, nStyle, cKey ) DEFAULT cCaption TO ::sl_caption @@ -363,7 +363,7 @@ METHOD WvgStatusBarPanel:new( cCaption, nStyle, cKey ) ::key := cKey RETURN Self -/*-*/ +// METHOD WvgStatusBarPanel:caption( cCaption ) IF cCaption == NIL diff --git a/harbour/contrib/gtwvg/static.prg b/harbour/contrib/gtwvg/static.prg index f73c1fe1d0..ba27d15ab3 100644 --- a/harbour/contrib/gtwvg/static.prg +++ b/harbour/contrib/gtwvg/static.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 26Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgStatic INHERIT WvgWindow @@ -97,7 +97,7 @@ CLASS WvgStatic INHERIT WvgWindow ENDCLASS -/*-*/ +// METHOD WvgStatic:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -111,7 +111,7 @@ METHOD WvgStatic:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgStatic:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -237,7 +237,7 @@ METHOD WvgStatic:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgStatic:handleEvent( nMessage, aNM ) @@ -274,7 +274,7 @@ METHOD WvgStatic:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgStatic:destroy() @@ -285,13 +285,13 @@ METHOD WvgStatic:destroy() RETURN NIL -/*-*/ +// METHOD WvgStatic:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgStatic:setCaption( xCaption, cDll ) diff --git a/harbour/contrib/gtwvg/syswnd.prg b/harbour/contrib/gtwvg/syswnd.prg index 167787126a..203ba39086 100644 --- a/harbour/contrib/gtwvg/syswnd.prg +++ b/harbour/contrib/gtwvg/syswnd.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 08Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgSysWindow INHERIT WvgPartHandler @@ -114,7 +114,7 @@ CLASS WvgSysWindow INHERIT WvgPartHandler ENDCLASS -/*-*/ +// METHOD WvgSysWindow:new( oParent, oOwner, aPos ) @@ -130,7 +130,7 @@ METHOD WvgSysWindow:new( oParent, oOwner, aPos ) RETURN Self -/*-*/ +// METHOD WvgSysWindow:create( oParent, oOwner, aPos ) @@ -146,43 +146,43 @@ METHOD WvgSysWindow:create( oParent, oOwner, aPos ) RETURN Self -/*-*/ +// METHOD WvgSysWindow:configure() RETURN Self -/*-*/ +// METHOD WvgSysWindow:destroy() RETURN Self -/*-*/ +// METHOD WvgSysWindow:disable() RETURN Self -/*-*/ +// METHOD WvgSysWindow:enable() RETURN Self -/*-*/ +// METHOD WvgSysWindow:hide() RETURN Self -/*-*/ +// METHOD WvgSysWindow:show() RETURN Self -/*-*/ +// METHOD WvgSysWindow:setPos( aPos ) @@ -190,7 +190,7 @@ METHOD WvgSysWindow:setPos( aPos ) RETURN Self -/*-*/ +// METHOD WvgSysWindow:currentPos() LOCAL aRect @@ -199,7 +199,7 @@ METHOD WvgSysWindow:currentPos() RETURN { aRect[ 1 ], aRect[ 2 ] } -/*-*/ +// METHOD WvgSysWindow:currentSize() LOCAL aRect @@ -208,15 +208,15 @@ METHOD WvgSysWindow:currentSize() RETURN { aRect[ 3 ] - aRect[ 1 ], aRect[ 4 ] - aRect[ 2 ] } -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * Class WvgFontDialog() */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvgFontDialog INHERIT WvgSysWindow @@ -291,7 +291,7 @@ CLASS WvgFontDialog INHERIT WvgSysWindow ENDCLASS -/*-*/ +// METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog @@ -311,7 +311,7 @@ METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog RETURN Self -/*-*/ +// METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog @@ -340,7 +340,7 @@ METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialo RETURN Self -/*-*/ +// METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog LOCAL aRect, nL, nH @@ -419,7 +419,7 @@ METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog RETURN 0 -/*-*/ +// METHOD display( nMode ) CLASS WvgFontDialog LOCAL hWnd, aInfo @@ -431,7 +431,7 @@ METHOD display( nMode ) CLASS WvgFontDialog ENDIF ::ok := .f. - aInfo := Wvg_ChooseFont( hWnd, {|h,m,w,l| ::wndProc( h,m,w,l ) }, ::familyName, ; + aInfo := Wvg_ChooseFont( hWnd, {| h, m, w, l | ::wndProc( h, m, w, l ) }, ::familyName, ; ::nominalPointSize, ::viewScreenFonts, ::viewPrinterFonts ) IF !( ::ok ) RETURN NIL @@ -439,7 +439,7 @@ METHOD display( nMode ) CLASS WvgFontDialog RETURN ::GetWvgFont( aInfo ) -/*-*/ +// METHOD destroy() CLASS WvgFontDialog @@ -447,7 +447,7 @@ METHOD destroy() CLASS WvgFontDialog RETURN Self -/*-*/ +// /* * Only callable from ::activateOK and ::activateApply */ @@ -473,15 +473,15 @@ METHOD GetWvgFont( aFont ) CLASS WvgFontDialog RETURN oWvgFont -/*-*/ -/*-*/ -/*-*/ +// +// +// /* Class WvgFont() */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvgFont @@ -531,7 +531,7 @@ CLASS WvgFont ENDCLASS -/*-*/ +// METHOD new( oPS ) CLASS WvgFont @@ -541,7 +541,7 @@ METHOD new( oPS ) CLASS WvgFont RETURN Self -/*-*/ +// METHOD create( cFontName ) CLASS WvgFont @@ -553,7 +553,7 @@ METHOD create( cFontName ) CLASS WvgFont RETURN Self -/*-*/ +// METHOD configure( cFontName ) CLASS WvgFont @@ -565,7 +565,7 @@ METHOD configure( cFontName ) CLASS WvgFont RETURN Self -/*-*/ +// METHOD destroy() CLASS WvgFont @@ -575,14 +575,14 @@ METHOD destroy() CLASS WvgFont RETURN Self -/*-*/ +// METHOD list() CLASS WvgFont LOCAL aList := {} RETURN aList -/*-*/ +// METHOD createFont() CLASS WvgFont LOCAL aFont @@ -624,4 +624,4 @@ METHOD createFont() CLASS WvgFont RETURN ::hFont -/*-*/ +// diff --git a/harbour/contrib/gtwvg/tabpage.prg b/harbour/contrib/gtwvg/tabpage.prg index 7bff3fef00..64c28e533a 100644 --- a/harbour/contrib/gtwvg/tabpage.prg +++ b/harbour/contrib/gtwvg/tabpage.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 01Mar2009 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,13 +74,13 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -/*-*/ +// CLASS WvgTabPage INHERIT WvgWindow @@ -106,7 +106,7 @@ CLASS WvgTabPage INHERIT WvgWindow ENDCLASS -/*-*/ +// METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPage @@ -118,7 +118,7 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPa RETURN Self -/*-*/ +// METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPage @@ -154,7 +154,7 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTa RETURN Self -/*-*/ +// METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage LOCAL aHdr @@ -191,7 +191,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD tabActivate( xParam ) CLASS WvgTabPage @@ -201,7 +201,7 @@ METHOD tabActivate( xParam ) CLASS WvgTabPage RETURN self -/*-*/ +// METHOD minimize() CLASS WvgTabPage @@ -209,7 +209,7 @@ METHOD minimize() CLASS WvgTabPage RETURN .f. -/*-*/ +// METHOD maximize() CLASS WvgTabPage @@ -217,7 +217,7 @@ METHOD maximize() CLASS WvgTabPage RETURN .t. -/*-*/ +// METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPage @@ -225,7 +225,7 @@ METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS Wv RETURN Self -/*-*/ +// METHOD destroy() CLASS WvgTabPage diff --git a/harbour/contrib/gtwvg/tests/activex.prg b/harbour/contrib/gtwvg/tests/activex.prg index 53484767af..ad251f72c8 100644 --- a/harbour/contrib/gtwvg/tests/activex.prg +++ b/harbour/contrib/gtwvg/tests/activex.prg @@ -5,7 +5,7 @@ /* * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -14,7 +14,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// // The function has to be called via hb_threadStart( {|| ExecuteActiveX( nActiveX ) } ) // FUNCTION ExecuteActiveX( nActiveX, xParam ) @@ -52,7 +52,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) //--------------------------- StatusBar ---------------------------\\ oSBar := WvgStatusBar():new( oDA ):create( , , , , , .t. ) - oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) } + oSBar:panelClick := {| oPanel | WVG_MessageBox( , oPanel:caption ) } oPanel := oSBar:getItem( 1 ) oPanel:caption := 'My Root Panel' oPanel1 := oSBar:addItem() @@ -86,7 +86,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } ) oRadio:caption := "Com 1" oRadio:selection := .T. - oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + iif( obj:selection, '< S >', '< N >' ) ) } + oRadio:selected := {| m1, m2, obj | m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + iif( obj:selection, '< S >', '< N >' ) ) } oRadio:create() oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } ) @@ -96,21 +96,21 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. ) oCheck:caption := 'Checkbox A' oCheck:create() - oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , iif( o:getData(), 'I am selected','I am not selected' ) ) } + oCheck:selected := {| m1, m2, o | m1:=m1,m2:=m2, WVG_MessageBox( , iif( o:getData(), 'I am selected','I am not selected' ) ) } // Create first 3State button, passing the position to :create() oXbp := Wvg3State():new( oStatic2 ) oXbp:caption := "3 State A" oXbp:create( , , { 10,100 }, { 100,15 } ) // Determine current state using mp1 - oXbp:selected := {| m1,m2,oBtn | m2:=m2, oBtn:=oBtn, oPanel1:caption := "3State A ["+aState[ m1+1 ]+"]" } + oXbp:selected := {| m1, m2, oBtn | m2:=m2, oBtn:=oBtn, oPanel1:caption := "3State A ["+aState[ m1+1 ]+"]" } // Create second 3State Button, passing the position to :new() oXbp := Wvg3State():new( oStatic2, , { 10,125 }, { 100,15 } ) oXbp:caption := "3 State B" oXbp:create( oStatic2 ) // Determine current state using :getData() - oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) } + oXbp:selected := {| m1, m2, oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) } // Create first SLE, specify position using :create() // On :typeOut set the focus to the second SLE @@ -118,20 +118,20 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oXbp:autoTab := .T. oXbp:bufferLength := 20 // Data code block containing assignment to LOCAL variable - oXbp:dataLink := {|x| iif( x == NIL, cVarA, cVarA := x ) } + oXbp:dataLink := {| x | iif( x == NIL, cVarA, cVarA := x ) } oXbp:create( , , { 10,170 }, { 150,20 } ) oXbp:setData() // Assign the value of the edit buffer to a LOCAL variable when the input focus is lost - oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarA =" + cVarA } + oXbp:killInputFocus := {| x, y, oSLE | x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarA =" + cVarA } // Create second SLE, specify position using :new() oXbp := WvgSLE():new( oStatic2, , { 10,200 }, { 150,20 } ) oXbp:tabStop := .T. oXbp:bufferLength := 15 - oXbp:dataLink := {|x| iif( x == NIL, cVarB, cVarB := x ) } + oXbp:dataLink := {| x | iif( x == NIL, cVarB, cVarB := x ) } oXbp:create( ) oXbp:setData() - oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB } + oXbp:killInputFocus := {| x, y, oSLE | x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB } // Read file into LOCAL variable cText := MemoRead( "hbmk.hbm" ) @@ -140,7 +140,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oMLE := WvgMLE():new( oStatic2 ) oMLE:wordWrap := .F. oMLE:border := .t. - oMLE:dataLink := {|x| iif( x==NIL, cText, cText := x ) } + oMLE:dataLink := {| x | iif( x == NIL, cText, cText := x ) } oMLE:create( oStatic2, , { 180,10 }, { 310,250 } ) // Copy text from LOCAL variable into edit buffer via :dataLink oMLE:setData() @@ -168,7 +168,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) aadd( aParts, 'XbpMLE' ) aadd( aParts, 'DataRef' ) - aeval( aParts, {|e| oListBox:addItem( e ) } ) + aeval( aParts, {| e | oListBox:addItem( e ) } ) oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) } oListBox:setData( 3 ) @@ -188,7 +188,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oTree:create() oTree:setColorBG( RGB( 120,15,240 ) ) oTree:setColorFG( RGB( 15,240,120 ) ) - oTree:itemSelected := {|oItem| iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } + oTree:itemSelected := {| oItem | iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -210,11 +210,11 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oTree:setData( oItem2 ) //--------------------------- Misc Config ------------------------\\ - oTBar:buttonClick := {|oBtn| iif( oBtn:caption == 'Hide' , oStatic:hide(), nil ),; - iif( oBtn:caption == 'Show' , oStatic:show(), nil ),; - iif( oBtn:caption == 'Tools', oStatic2:show():toFront(), nil ),; - iif( oBtn:caption $ 'Hide,Show', oCrt:sendMessage( WM_SIZE, 0, 0 ), NIL ),; - oPanel2:caption := "Button [ " + oBtn:caption + " ] clicked!" } + oTBar:buttonClick := {| oBtn | iif( oBtn:caption == 'Hide' , oStatic:hide(), nil ),; + iif( oBtn:caption == 'Show' , oStatic:show(), nil ),; + iif( oBtn:caption == 'Tools', oStatic2:show():toFront(), nil ),; + iif( oBtn:caption $ 'Hide,Show', oCrt:sendMessage( WM_SIZE, 0, 0 ), NIL ),; + oPanel2:caption := "Button [ " + oBtn:caption + " ] clicked!" } oDA:resize := {|| ResizeDialog( oCrt, oTBar, oSBar, oStatic, oCom, oTree ) } #if 1 @@ -237,7 +237,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam ) oCrt:Destroy() Return NIL -//----------------------------------------------------------------------// +// STATIC FUNCTION ResizeDialog( oCrt, oTBar, oSBar, oStatic, oCom, oTree ) LOCAL aCrt, aTBar, aSBar @@ -265,7 +265,7 @@ STATIC FUNCTION ResizeDialog( oCrt, oTBar, oSBar, oStatic, oCom, oTree ) RETURN 1 -//----------------------------------------------------------------------// +// Static Function ActiveXBuildMenu( oCrt, oStatic, oStatic2 ) Local oMenuBar, oSubMenu @@ -280,7 +280,7 @@ Static Function ActiveXBuildMenu( oCrt, oStatic, oStatic2 ) oSubMenu:title := "~Procedural" oSubMenu:addItem( { "Play Charge ~1", } ) oSubMenu:addItem( { "Play Nannyboo ~2", } ) - oSubMenu:itemSelected := {|mp1| MyFunction( 100+mp1 ) } + oSubMenu:itemSelected := {| mp1 | MyFunction( 100+mp1 ) } oMenuBar:addItem( { oSubMenu, NIL } ) // Define submenu in the functional style: @@ -303,7 +303,7 @@ Static Function ActiveXBuildMenu( oCrt, oStatic, oStatic2 ) Return NIL -//----------------------------------------------------------------------// +// STATIC FUNCTION BuildActiveXControl( nActiveX, oDA ) LOCAL oCom @@ -344,7 +344,7 @@ STATIC FUNCTION BuildActiveXControl( nActiveX, oDA ) oCom:showAboutBox() ; } ) - oCom:mapEvent( evBtnUp, {|nBtn| iif( nBtn == 2, oCom:oParent:sendMessage( WM_CLOSE,0,0 ), NIL ) } ) + oCom:mapEvent( evBtnUp, {| nBtn | iif( nBtn == 2, oCom:oParent:sendMessage( WM_CLOSE,0,0 ), NIL ) } ) case nActiveX == 3 hb_gtInfo( HB_GTI_WINTITLE, 'file://' + hb_DirBase() + 'myharu.pdf' ) @@ -369,7 +369,7 @@ STATIC FUNCTION BuildActiveXControl( nActiveX, oDA ) RETURN oCom -//----------------------------------------------------------------------// +// STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam ) Local nKey, sData @@ -586,7 +586,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam ) RETURN NIL -//----------------------------------------------------------------------// +// STATIC FUNCTION ConfigureRMChart( RMChart ) LOCAL oRegion @@ -630,7 +630,7 @@ STATIC FUNCTION ConfigureRMChart( RMChart ) RETURN NIL -//----------------------------------------------------------------------// +// STATIC FUNCTION MyFunction( nMode ) @@ -652,7 +652,7 @@ STATIC FUNCTION MyFunction( nMode ) Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } ) case nMode == 102 // NannyBoo - AEval( {{196,2},{196,2},{164,2},{220,2},{196,4},{164,4}}, {|a| tone(a[1],a[2]) } ) + AEval( {{196,2},{196,2},{164,2},{220,2},{196,4},{164,4}}, {| a | tone( a[ 1 ], a[ 2 ] ) } ) case nMode == 103 // BADKEY tone( 480,0.25 ) @@ -662,4 +662,4 @@ STATIC FUNCTION MyFunction( nMode ) RETURN NIL -//----------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/tests/cuigdlgs.prg b/harbour/contrib/gtwvg/tests/cuigdlgs.prg index 464099a2ac..ee84d85b3f 100644 --- a/harbour/contrib/gtwvg/tests/cuigdlgs.prg +++ b/harbour/contrib/gtwvg/tests/cuigdlgs.prg @@ -1,38 +1,38 @@ /* * $Id$ */ - -/* + +/* * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" #include "wvtwin.ch" #include "hbgtinfo.ch" #include "hbgtwvg.ch" -#include "wvgparts.ch" +#include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// // // Simplified Console with GUI Look // -/*----------------------------------------------------------------------*/ +// PROCEDURE ExecGCUI() IF hb_mtvm() - Hb_ThreadStart( {|oCrt| oCrt := WvgCrt():New( , , { 2,4 }, { 20,81 }, , .t. ) , ; - oCrt:icon := GetResource( "dia_excl.ico" ),; - oCrt:create(), ; - GCUIConsole( oCrt ) , ; - oCrt:destroy() } ) + Hb_ThreadStart( {| oCrt | oCrt := WvgCrt():New( , , { 2,4 }, { 20,81 }, , .t. ) , ; + oCrt:icon := GetResource( "dia_excl.ico" ),; + oCrt:create(), ; + GCUIConsole( oCrt ) , ; + oCrt:destroy() } ) ENDIF RETURN - -//----------------------------------------------------------------------// + +// #xTranslate Alert( => MyAlert( @@ -82,7 +82,7 @@ PROCEDURE GCUIConsole( oCrt ) // The only additional calls to render your console GUI // // The GETLIST : This can be embedded via @ GET preprocessor command - aEval( GetList, {|oGet| Wvg_BoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) + aEval( GetList, {| oGet | Wvg_BoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) // hBoxR := Wvg_BoxRaised( 1,2,18,49, {-5,-5,5,5} ) // @@ -111,8 +111,8 @@ PROCEDURE GCUIConsole( oCrt ) My_Alert( 'How did you like the "Alert" replacement?', { 'WOW','OK','OOps'} ) RETURN - -/*----------------------------------------------------------------------*/ + +// STATIC FUNCTION FetchText( nMode ) LOCAL cText @@ -132,5 +132,5 @@ STATIC FUNCTION FetchText( nMode ) ENDCASE RETURN cText - -/*----------------------------------------------------------------------*/ + +// diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index 8beac5bfe0..8642ba6b1e 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -2,9 +2,9 @@ * $Id$ */ -//-------------------------------------------------------------------// -//-------------------------------------------------------------------// -//-------------------------------------------------------------------// +// +// +// // // GTWVT Console GUI Interface // @@ -22,8 +22,8 @@ // // Thanks Peter Rees! You have laid the foundation! // -//-------------------------------------------------------------------// -//-------------------------------------------------------------------// +// +// #include "inkey.ch" #include "common.ch" @@ -32,12 +32,12 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// REQUEST DbfCdx REQUEST DbfNtx -//-------------------------------------------------------------------// +// #define IMAGE_VOUCH hb_dirBase() + "vouch1.bmp" #define IMAGE_BROWSE hb_dirBase() + "v_browse.ico" @@ -48,17 +48,17 @@ REQUEST DbfNtx #define OBJ_TYPE_BUTTON 1 -//-------------------------------------------------------------------// +// #ifndef __SQL__ ANNOUNCE Hb_NoStartUpWindow #endif -//-------------------------------------------------------------------// +// MEMVAR cCdxExp, First, Last, City -//-------------------------------------------------------------------// +// THREAD STATIC t_wvtScreen := {} @@ -66,7 +66,7 @@ MEMVAR cCdxExp, First, Last, City STATIC s_paint_:= { { "", {} } } #endif -/*----------------------------------------------------------------------*/ +// EXIT PROCEDURE CleanHandles() LOCAL obj @@ -82,7 +82,7 @@ EXIT PROCEDURE CleanHandles() RETURN -//-------------------------------------------------------------------// +// PROCEDURE Main() LOCAL aLastPaint, clr, scr, pGT @@ -103,7 +103,7 @@ PROCEDURE Main() LOCAL cLabel := "Harbour simulated GUI." LOCAL aObjects := WvtSetObjects( {} ) LOCAL oLastMenu - LOCAL oError := ErrorBlock( {|o| MyError( o ) } ) + LOCAL oError := ErrorBlock( {| o | MyError( o ) } ) SET DATE ANSI @@ -152,7 +152,7 @@ PROCEDURE Main() aAdd( aBlocks, {|| Wvt_DrawBoxRecessed( 7, 48, 13, 55 ) } ) aAdd( aBlocks, {|| Wvt_DrawLine( maxrow()-2,0,maxrow()-2,maxcol(),WVT_LINE_HORZ,WVT_LINE_RECESSED,WVT_LINE_BOTTOM ) } ) aAdd( aBlocks, {|| Wvt_DrawLine( maxrow()-1,41,maxrow(),41,WVT_LINE_VERT,WVT_LINE_RECESSED,WVT_LINE_CENTER ) } ) - aAdd( aBlocks, {|| aEval( GetList, {|oGet| Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) + aAdd( aBlocks, {|| aEval( GetList, {| oGet | Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) aAdd( aBlocks, {|| Wvt_Mouse( -1000001 ) } ) @@ -200,7 +200,7 @@ PROCEDURE Main() RETURN -//-------------------------------------------------------------------// +// FUNCTION HB_GTSYS() REQUEST HB_GT_WVG_DEFAULT @@ -208,22 +208,22 @@ FUNCTION HB_GTSYS() REQUEST HB_GT_WGU RETURN NIL -//------------------------------------------------------------------// +// PROCEDURE WvtConsoleGets( nMode ) DEFAULT nMode TO 0 IF hb_mtvm() - Hb_ThreadStart( {|oCrt| hb_gtReload( 'WVT' ) , ; - oCrt := hb_gtSelect(), ; - iif( nMode == 0, WvtNextGetsConsole(), GoogleMap() ) , ; - oCrt := NIL } ) + Hb_ThreadStart( {| oCrt | hb_gtReload( 'WVT' ) , ; + oCrt := hb_gtSelect(), ; + iif( nMode == 0, WvtNextGetsConsole(), GoogleMap() ) , ; + oCrt := NIL } ) ENDIF RETURN -//----------------------------------------------------------------------// +// PROCEDURE WvtNextGetsConsole() LOCAL dDate := stod() @@ -258,20 +258,20 @@ PROCEDURE WvtNextGetsConsole() RETURN -//-------------------------------------------------------------------// +// PROCEDURE WvtNextGets() IF hb_mtvm() - Hb_ThreadStart( {|| Hb_gtReload( 'WVG' ), Wvt_setFont( 'Terminal',20 ), ; - hb_clear(), Wvt_ShowWindow( SW_RESTORE ), WvtNextGets_X() } ) + Hb_ThreadStart( {|| Hb_gtReload( 'WVG' ), Wvt_setFont( 'Terminal',20 ), ; + hb_clear(), Wvt_ShowWindow( SW_RESTORE ), WvtNextGets_X() } ) ELSE WvtNextGets_X() ENDIF RETURN -//----------------------------------------------------------------------// +// PROCEDURE WvtNextGets_X() LOCAL aLastPaint, clr @@ -308,7 +308,7 @@ PROCEDURE WvtNextGets_X() aAdd( aBlocks, {|| Wvt_SetBrush( 2, rgb( 255,255,100 ),1 ) } ) aAdd( aBlocks, {|| Wvt_DrawRectangle( 11, 50, 13, 58 ) } ) aAdd( aBlocks, {|| Wvt_DrawBoxGroupRaised( 5, 6, 19, 72 ) } ) - aAdd( aBlocks, {|| aEval( GetList, {|oGet| Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) + aAdd( aBlocks, {|| aEval( GetList, {| oGet | Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) aAdd( aBlocks, {|| Wvt_DrawButton( 21, 6,22, 9,"New" ,"vouch1.bmp" ) } ) aAdd( aBlocks, {|| Wvt_DrawButton( 21,11,22,14,"Browse","vouch1.bmp", 1, rgb( 255,255,255 ) ) } ) @@ -351,7 +351,7 @@ PROCEDURE WvtNextGets_X() SetPos( nRow, nCol ) RETURN -//-------------------------------------------------------------------// +// FUNCTION WvtPartialScreen() LOCAL scr := SaveScreen( 7,20,15,60 ) @@ -394,7 +394,7 @@ FUNCTION WvtPartialScreen() RETURN NIL -//-------------------------------------------------------------------// +// FUNCTION WvtLines() LOCAL scr := SaveScreen( 0,0,maxrow(),maxcol() ) @@ -455,7 +455,7 @@ FUNCTION WvtLines() RETURN NIL -//-------------------------------------------------------------------// +// FUNCTION BuildMainMenu() LOCAL oMenu @@ -533,7 +533,7 @@ FUNCTION BuildMainMenu() RETURN oMenu /* The last submenu item */ -//-------------------------------------------------------------------// +// STATIC FUNCTION GoogleMap() LOCAL mfrom1, mto1, mfrom2, mto2, mfrom3, mto3, mweb @@ -574,7 +574,7 @@ STATIC FUNCTION GoogleMap() RETURN NIL -//----------------------------------------------------------------------// +// FUNCTION BuildButtons() LOCAL oXbp @@ -628,4 +628,4 @@ FUNCTION BuildButtons() RETURN NIL -/*----------------------------------------------------------------------*/ +// diff --git a/harbour/contrib/gtwvg/tests/demowvg1.prg b/harbour/contrib/gtwvg/tests/demowvg1.prg index d48d13d1f4..ea2391a391 100644 --- a/harbour/contrib/gtwvg/tests/demowvg1.prg +++ b/harbour/contrib/gtwvg/tests/demowvg1.prg @@ -2,13 +2,13 @@ * $Id$ */ -/*----------------------------------------------------------------------*/ +// // // GTWVT Console GUI Interface // // Pritpal Bedi // -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -17,7 +17,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// #define IMAGE_VOUCH hb_dirBase() + "vouch1.bmp" #define IMAGE_BROWSE hb_dirBase() + "v_browse.ico" @@ -26,11 +26,11 @@ #define IMAGE_TOOLS hb_dirBase() + "v_tools.ico" #define IMAGE_HELP hb_dirBase() + "v_notes.ico" -/*----------------------------------------------------------------------*/ +// MEMVAR GetList -/*----------------------------------------------------------------------*/ +// FUNCTION Main() LOCAL aPaint @@ -60,20 +60,20 @@ FUNCTION Main() aAdd( aPaint, { "Image" , {|| Wvt_DrawImage( 8,62,12,69, IMAGE_VOUCH ) } , { WVT_BLOCK_IMAGE, 8, 62, 12, 69 } } ) aAdd( aPaint, { "Box_5" , {|| Wvt_DrawBoxRecessed( 7, 48, 13, 55 ) } , { WVT_BLOCK_BOX , 7, 48, 13, 55 } } ) aAdd( aPaint, { "Line_1", {|| Wvt_DrawLine( maxrow()-2, 0, maxrow()-2, maxcol(), WVT_LINE_HORZ, WVT_LINE_RECESSED, WVT_LINE_BOTTOM ) } , NIL } ) - aAdd( aPaint, { "Gets" , {|| aEval( GetList, {|oGet| Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) }, NIL } ) + aAdd( aPaint, { "Gets" , {|| aEval( GetList, {| oGet | Wvt_DrawBoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) }, NIL } ) ExecForm( aPaint ) RETURN NIL -/*----------------------------------------------------------------------*/ +// /* This function must be linked with the application */ FUNCTION Wvt_Paint() WvtPaintObjects() RETURN NIL -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION ExecForm( aPaint ) LOCAL cColor := SetColor() @@ -113,7 +113,7 @@ STATIC FUNCTION ExecForm( aPaint ) RETURN NIL -/*----------------------------------------------------------------------*/ +// FUNCTION HB_GTSYS() REQUEST HB_GT_WVG_DEFAULT @@ -121,7 +121,7 @@ FUNCTION HB_GTSYS() REQUEST HB_GT_WGU RETURN NIL -/*----------------------------------------------------------------------*/ +// FUNCTION SetGT( nIndex, pGT ) LOCAL oldGT @@ -132,7 +132,7 @@ FUNCTION SetGT( nIndex, pGT ) ENDIF RETURN oldGT -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION MyChoice( aChoices ) LOCAL scr, clr, nChoice @@ -149,12 +149,12 @@ STATIC FUNCTION MyChoice( aChoices ) RETURN nChoice -//-------------------------------------------------------------------// +// FUNCTION rgb( r,g,b ) RETURN r + ( g * 256 ) + ( b * 256 * 256 ) -//-------------------------------------------------------------------// +// FUNCTION DispStatusMsg( cMsg ) @@ -166,7 +166,7 @@ FUNCTION DispStatusMsg( cMsg ) RETURN .t. -//-------------------------------------------------------------------// +// FUNCTION ClearStatusMsg() LOCAL nRow := Row() @@ -177,7 +177,7 @@ FUNCTION ClearStatusMsg() RETURN .t. -//-------------------------------------------------------------------// +// FUNCTION DoModalDialog() LOCAL oCrt, nSel @@ -212,4 +212,4 @@ FUNCTION DoModalDialog() WvtSetPaint( aPnt ) Return NIL -//----------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/tests/demoxbp.prg b/harbour/contrib/gtwvg/tests/demoxbp.prg index 00ea6d296e..13b650d6c5 100644 --- a/harbour/contrib/gtwvg/tests/demoxbp.prg +++ b/harbour/contrib/gtwvg/tests/demoxbp.prg @@ -2,9 +2,9 @@ * $Id$ */ -/*----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------*/ +// +// +// // // EnOnkar // ( The Lord is ONE ) @@ -14,9 +14,9 @@ // Pritpal Bedi // 08Dec2008 // -/*----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------*/ +// +// +// #include "inkey.ch" #include "common.ch" @@ -25,7 +25,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// FUNCTION Main() Local oCrt, oTBar, oSBar, oStatic, oCom, oXbp, oTree, oItem1, oItem2 @@ -53,7 +53,7 @@ FUNCTION Main() //--------------------------- StatusBar ---------------------------\\ oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .t. ) - oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) } + oSBar:panelClick := {| oPanel | WVG_MessageBox( , oPanel:caption ) } oPanel := oSBar:getItem( 1 ) oPanel:caption := 'My Root Panel' oPanel1 := oSBar:addItem() @@ -101,7 +101,7 @@ FUNCTION Main() aadd( aParts, '-------------' ) aadd( aParts, 'DataRef' ) - aeval( aParts, {|e| oListBox:addItem( e ) } ) + aeval( aParts, {| e | oListBox:addItem( e ) } ) oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) } oListBox:setData( 3 ) // show selected 'XbpToolBar' @@ -122,7 +122,7 @@ FUNCTION Main() oTree:create() oTree:setColorBG( RGB( 120,15,240 ) ) oTree:setColorFG( RGB( 15,240,120 ) ) - oTree:itemSelected := {|oItem| iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } + oTree:itemSelected := {| oItem | iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -151,8 +151,8 @@ FUNCTION Main() oCom:mapEvent( 269, {|| QOut( ' E X P L O R E R - 2 6 9' ) } ) #else oCom := WvgHTMLViewer():New( oDA, , { 0, 0 }, { 100, 100 }, , .t. ) - oCom:beforeNavigate := {|cURL, x, oHTML| x := x, oHTML := oHTML, oPanel:caption := cURL } - oCom:statusTextChange := {|cText| oPanel:caption := cText } + oCom:beforeNavigate := {| cURL, x, oHTML | x := x, oHTML := oHTML, oPanel:caption := cURL } + oCom:statusTextChange := {| cText | oPanel:caption := cText } #endif oCom:create() oCom:Navigate( 'http://www.harbour.vouch.info' ) @@ -161,12 +161,12 @@ FUNCTION Main() oAddr:bufferLength := 500 oAddr:border := .t. cNavigate := 'http://www.harbour.vouch.info' - oAddr:dataLink := {|x| iif( x == NIL, cNavigate, cNavigate := x ) } + oAddr:dataLink := {| x | iif( x == NIL, cNavigate, cNavigate := x ) } oAddr:setColorFG( RGB( 0,0,255 ) ) oAddr:setColorBG( RGB( 0,255,255 ) ) oAddr:create( oDA, , { 120, oTBar:currentSize()[2] }, { 500,20 }, , .t. ) oAddr:setData() - oAddr:killInputFocus := {|m1,m2,oS| m1:=m1, m2:=m2, oS:getData(), oCom:navigate( cNavigate ) } + oAddr:killInputFocus := {| m1, m2, oS | m1:=m1, m2:=m2, oS:getData(), oCom:navigate( cNavigate ) } //----------------- Panel : Static + Radio + Checkbox ----------\\ oStatic2:= WvgStatic():New( oDA, , { 150, 150 }, { 500,310 }, , .f. ) @@ -185,7 +185,7 @@ FUNCTION Main() oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } ) oRadio:caption := "Com 1" oRadio:selection := .T. - oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + iif( obj:selection, '< S >', '< N >' ) ) } + oRadio:selected := {| m1, m2, obj | m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + iif( obj:selection, '< S >', '< N >' ) ) } oRadio:create() oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } ) @@ -195,21 +195,21 @@ FUNCTION Main() oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. ) oCheck:caption := 'Checkbox A' oCheck:create() - oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , iif( o:getData(), 'I am selected','I am not selected' ) ) } + oCheck:selected := {| m1, m2, o | m1:=m1,m2:=m2, WVG_MessageBox( , iif( o:getData(), 'I am selected','I am not selected' ) ) } // Create first 3State button, passing the position to :create() oXbp := Wvg3State():new() oXbp:caption := "3 State A" oXbp:create( oStatic2, , { 10,100 }, { 100,15 } ) // Determine current state using mp1 - oXbp:selected := {| m1,m2,oBtn | m2:=m2, oBtn:=oBtn, oPanel1:caption := "3State A ["+aState[ m1+1 ]+"]" } + oXbp:selected := {| m1, m2, oBtn | m2:=m2, oBtn:=oBtn, oPanel1:caption := "3State A ["+aState[ m1+1 ]+"]" } // Create second 3State Button, passing the position to :new() oXbp := Wvg3State():new( oStatic2, , { 10,125 }, { 100,15 } ) oXbp:caption := "3 State B" oXbp:create( oStatic2 ) // Determine current state using :getData() - oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) } + oXbp:selected := {| m1, m2, oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) } // Create first SLE, specify position using :create() // On :typeOut set the focus to the second SLE @@ -217,20 +217,20 @@ FUNCTION Main() oXbp:autoTab := .T. oXbp:bufferLength := 20 // Data code block containing assignment to LOCAL variable - oXbp:dataLink := {|x| iif( x == NIL, cVarA, cVarA := x ) } + oXbp:dataLink := {| x | iif( x == NIL, cVarA, cVarA := x ) } oXbp:create( oStatic2, , { 10,170 }, { 150,20 } ) oXbp:setData() // Assign the value of the edit buffer to a LOCAL variable when the input focus is lost - oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarA =" + cVarA } + oXbp:killInputFocus := {| x, y, oSLE | x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarA =" + cVarA } // Create second SLE, specify position using :new() oXbp := WvgSLE():new( , , { 10,200 }, { 150,20 } ) oXbp:tabStop := .T. oXbp:bufferLength := 15 - oXbp:dataLink := {|x| iif( x == NIL, cVarB, cVarB := x ) } + oXbp:dataLink := {| x | iif( x == NIL, cVarB, cVarB := x ) } oXbp:create( oStatic2 ) oXbp:setData() - oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB } + oXbp:killInputFocus := {| x, y, oSLE | x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB } // Read file into LOCAL variable cText := MemoRead( 'gtwvg.hbc' ) @@ -239,18 +239,18 @@ FUNCTION Main() oMLE := WvgMLE():new() oMLE:wordWrap := .F. oMLE:border := .t. - oMLE:dataLink := {|x| iif( x==NIL, cText, cText := x ) } + oMLE:dataLink := {| x | iif( x == NIL, cText, cText := x ) } oMLE:create( oStatic2, , { 180,10 }, { 310,250 } ) // Copy text from LOCAL variable into edit buffer via :dataLink oMLE:setData() //--------------------------- Misc Config ------------------------\\ - oTBar:buttonClick := {|oBtn| iif( oBtn:caption == 'Hide' , oStatic:hide(), nil ),; - iif( oBtn:caption == 'Show' , oStatic:show(), nil ),; - iif( oBtn:caption == 'Tools' , oStatic2:show():toFront(), nil ),; - iif( oBtn:caption == 'FontDlg', ExeFontDialog( oCrt ), nil ),; - iif( oBtn:caption $ 'Hide,Show', oCrt:sendMessage( WM_SIZE, 0, 0 ), NIL ),; - oPanel2:caption := "Button [ " + oBtn:caption + " ] clicked!" } + oTBar:buttonClick := {| oBtn | iif( oBtn:caption == 'Hide' , oStatic:hide(), nil ),; + iif( oBtn:caption == 'Show' , oStatic:show(), nil ),; + iif( oBtn:caption == 'Tools' , oStatic2:show():toFront(), nil ),; + iif( oBtn:caption == 'FontDlg', ExeFontDialog( oCrt ), nil ),; + iif( oBtn:caption $ 'Hide,Show', oCrt:sendMessage( WM_SIZE, 0, 0 ), NIL ),; + oPanel2:caption := "Button [ " + oBtn:caption + " ] clicked!" } oCrt:resize := {|| ResizeDialogXbp( oCrt, oTBar, oSBar, oStatic, oCom, oTree, oAddr ) } @@ -266,7 +266,7 @@ FUNCTION Main() oCrt:Destroy() Return nil -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION ResizeDialogXbp( oCrt, oTBar, oSBar, oStatic, oCom, oTree, oAddr ) LOCAL aCrt, aTBar, aSBar @@ -294,7 +294,7 @@ STATIC FUNCTION ResizeDialogXbp( oCrt, oTBar, oSBar, oStatic, oCom, oTree, oAddr RETURN 1 -/*----------------------------------------------------------------------*/ +// Static Function ActiveXBuildMenuXbp( oCrt, oStatic, oStatic2 ) Local oMenuBar, oSubMenu @@ -309,7 +309,7 @@ Static Function ActiveXBuildMenuXbp( oCrt, oStatic, oStatic2 ) oSubMenu:title := "~Procedural" oSubMenu:addItem( { "Play Charge ~1", } ) oSubMenu:addItem( { "Play Nannyboo ~2", } ) - oSubMenu:itemSelected := {|mp1| MyFunctionXbp( 100+mp1 ) } + oSubMenu:itemSelected := {| mp1 | MyFunctionXbp( 100+mp1 ) } oMenuBar:addItem( { oSubMenu, NIL } ) // Define submenu in the functional style: @@ -334,7 +334,7 @@ Static Function ActiveXBuildMenuXbp( oCrt, oStatic, oStatic2 ) oMenuBar:addItem( { oSubMenu, NIL } ) Return nil -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION ActiveXBuildToolBarXbp( oCrt ) LOCAL oTBar @@ -367,7 +367,7 @@ STATIC FUNCTION ActiveXBuildToolBarXbp( oCrt ) RETURN oTBar -/*----------------------------------------------------------------------*/ +// Static Function MyFunctionXbp( nMode ) @@ -389,7 +389,7 @@ Static Function MyFunctionXbp( nMode ) Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } ) case nMode == 102 // NannyBoo - AEval( {{196,2},{196,2},{164,2},{220,2},{196,4},{164,4}}, {|a| tone(a[1],a[2]) } ) + AEval( {{196,2},{196,2},{164,2},{220,2},{196,4},{164,4}}, {| a | tone(a[1],a[2]) } ) case nMode == 103 // BADKEY tone( 480,0.25 ) @@ -399,7 +399,7 @@ Static Function MyFunctionXbp( nMode ) Return nil -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION ExeFontDialog( oCrt ) LOCAL oFontDlg, oWvgFont @@ -432,7 +432,7 @@ STATIC FUNCTION ExeFontDialog( oCrt ) RETURN nil -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION HB_GTSYS() @@ -443,4 +443,4 @@ STATIC FUNCTION HB_GTSYS() RETURN NIL -/*----------------------------------------------------------------------*/ +// diff --git a/harbour/contrib/gtwvg/tests/dyndlgs.prg b/harbour/contrib/gtwvg/tests/dyndlgs.prg index e74c17e8b4..42ad2cec46 100644 --- a/harbour/contrib/gtwvg/tests/dyndlgs.prg +++ b/harbour/contrib/gtwvg/tests/dyndlgs.prg @@ -6,7 +6,7 @@ * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -15,7 +15,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// #define ID_BTN_OK 1 #define ID_MLE 10 @@ -37,15 +37,15 @@ #define ID_MNU_FILE 201 #define ID_MNU_CONTROL 202 -/*----------------------------------------------------------------------*/ +// #define CRLF chr( 13 )+chr( 10 ) -/*----------------------------------------------------------------------*/ +// thread static t_aSlides := {} -/*----------------------------------------------------------------------*/ +// FUNCTION DynWinDialog( nInfo ) Local hDlg, aDlg, nStyle, cDlgIcon, cDlgProc, lOnTop, hMenu @@ -119,7 +119,7 @@ FUNCTION DynWinDialog( nInfo ) lOnTop := .f. cDlgProc := "DynDlgProc" -// bDlgProc := {|a,b,c,d| DYNDLGPROC(a,b,c,d) } +// bDlgProc := {| a, b, c, d | DYNDLGPROC( a, b, c, d ) } cDlgIcon := "v_notes.ico" // nTimerTicks := 1000 // 1 second @@ -139,7 +139,7 @@ FUNCTION DynWinDialog( nInfo ) RETURN hDlg -//-------------------------------------------------------------------// +// FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) Local lClicked, cPrompt, nIndex, hFont, aHFonts @@ -274,7 +274,7 @@ FUNCTION DynDlgProc( hDlg, nMsg, wParam, lParam ) RETURN 0 -//-------------------------------------------------------------------// +// STATIC FUNCTION GetEditText() LOCAL cText := "" @@ -306,7 +306,7 @@ STATIC FUNCTION GetEditText() RETURN cText -//-------------------------------------------------------------------// +// FUNCTION DlgSlideShow() LOCAL hDlg, aDlg, nStyle @@ -321,7 +321,7 @@ FUNCTION DlgSlideShow() RETURN hDlg -//-------------------------------------------------------------------// +// FUNCTION DlgSlideShowProc( hDlg, nMsg, wParam, lParam ) @@ -352,7 +352,7 @@ FUNCTION DlgSlideShowProc( hDlg, nMsg, wParam, lParam ) RETURN 0 -//-------------------------------------------------------------------// +// FUNCTION DrawSlide( hDlg, nSlide ) LOCAL hDC, aRect @@ -368,4 +368,4 @@ FUNCTION DrawSlide( hDlg, nSlide ) Return NIL -//----------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/tests/modal.prg b/harbour/contrib/gtwvg/tests/modal.prg index 052ede305f..89766eba61 100644 --- a/harbour/contrib/gtwvg/tests/modal.prg +++ b/harbour/contrib/gtwvg/tests/modal.prg @@ -4,7 +4,7 @@ /* * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -13,7 +13,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// #xUntranslate alert( => @@ -38,19 +38,19 @@ FUNCTION MyAlert( cMsg, aOpt ) #xTranslate Alert( => MyAlert( -/*----------------------------------------------------------------------*/ +// FUNCTION My_Alert( cMessage, aOptions, cCaption, nInit, nTime ) RETURN DialogAlert( cCaption, cMessage, aOptions, nInit, , ,nTime ) -/*----------------------------------------------------------------------*/ +// #xUntranslate alert( => FUNCTION Just_Alert( cMsg, aOpt ) RETURN Alert( cMsg, aOpt ) #xTranslate Alert( => MyAlert( -/*----------------------------------------------------------------------*/ +// #define DLG_CLR_MOUSE 1 #define DLG_CLR_CAPT 2 @@ -84,7 +84,7 @@ FUNCTION Just_Alert( cMsg, aOpt ) <.lModal.>, <.lRowCols.>, <.lHidden.>, <.lCenter.>, ; , , <.lNoTitleBar.> ) -/*----------------------------------------------------------------------*/ +// FUNCTION DialogAlert( cCaption, aText_, aButtons_, sel, aMessage_, nTop, nTime ) LOCAL nLinesRqd, nColRqd, nLeft, nBottom, nRight, oCrt @@ -125,15 +125,15 @@ FUNCTION DialogAlert( cCaption, aText_, aButtons_, sel, aMessage_, nTop, nTime ) nColCap := len( cCaption )+ 7 // " - "+" "+caption+" " nColTxt := 0 if !empty(aText_) - aeval(aText_, {|e| nColTxt := max( nColTxt, len( e ) ) } ) + aeval(aText_, {| e | nColTxt := max( nColTxt, len( e ) ) } ) endif nColTxt += 6 // for two spaces at both sides nColBut := 0 - aeval( aButtons_, {|e| nColBut += len( e ) + 7 } ) + aeval( aButtons_, {| e | nColBut += len( e ) + 7 } ) nColBut += 3 nColRqd := 0 - aeval( { nColCap, nColTxt, nColBut }, {|e| nColRqd := max( nColRqd, e ) } ) + aeval( { nColCap, nColTxt, nColBut }, {| e | nColRqd := max( nColRqd, e ) } ) nLeft := iif( maxCol > nColRqd, int( ( maxCol - nColRqd ) / 2 ), 0 ) nRight := nLeft+nColRqd @@ -195,7 +195,7 @@ FUNCTION DialogAlert( cCaption, aText_, aButtons_, sel, aMessage_, nTop, nTime ) setColor( pal_[ DLG_CLR_HISEL ] ) @ nBtnRow, nBtnCol_[ sel ]+2 SAY substr( aButtons_[ sel ],1,1 ) - aeval( x_, {|e_| Wvg_BoxRaised( e_[ 1 ], e_[ 2 ], e_[ 3 ], e_[ 4 ] ) } ) + aeval( x_, {| e_ | Wvg_BoxRaised( e_[ 1 ], e_[ 2 ], e_[ 3 ], e_[ 4 ] ) } ) dispend() @@ -275,7 +275,7 @@ FUNCTION DialogAlert( cCaption, aText_, aButtons_, sel, aMessage_, nTop, nTime ) return sel -//----------------------------------------------------------------------// +// FUNCTION CreateOCrt( nT, nL, nB, nR, cTitle, xIcon, lModal, lRowCols, lHidden, ; lCenter, nRow, nCol, lNoTitleBar ) @@ -318,7 +318,7 @@ FUNCTION CreateOCrt( nT, nL, nB, nR, cTitle, xIcon, lModal, lRowCols, lHidden, ; RETURN oCrt -/*----------------------------------------------------------------------*/ +// FUNCTION DoModalWindow() LOCAL oCrt, nSel, pGT @@ -363,4 +363,4 @@ FUNCTION DoModalWindow() WvtSetBlocks( aLastPaint ) Return NIL -//----------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/tests/tbrowser.prg b/harbour/contrib/gtwvg/tests/tbrowser.prg index 5f56fcdcb8..ad5ef50caf 100644 --- a/harbour/contrib/gtwvg/tests/tbrowser.prg +++ b/harbour/contrib/gtwvg/tests/tbrowser.prg @@ -11,7 +11,7 @@ * * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -20,7 +20,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// #define K_MOVING 1001 @@ -37,12 +37,12 @@ #define K_SBTHUMBTRACKVERT 1059 #define K_SBTHUMBTRACKHORZ 1060 -/*----------------------------------------------------------------------*/ +// FUNCTION WvtMyBrowse() IF hb_mtvm() - Hb_ThreadStart( {|oCrt| oCrt := WvgCrt():new( , , { -1,-2 }, { 34,69 }, , .T. ), ; + Hb_ThreadStart( {| oCrt | oCrt := WvgCrt():new( , , { -1,-2 }, { 34,69 }, , .T. ), ; oCrt:resizeMode := HB_GTI_RESIZEMODE_ROWS,; oCrt:icon := GetResource( "dia_excl.ico" ),; oCrt:create(),; @@ -57,7 +57,7 @@ FUNCTION WvtMyBrowse() RETURN NIL -//----------------------------------------------------------------------// +// FUNCTION ExecBrowser( oCrt ) LOCAL nKey, bBlock, oBrowse , aLastPaint, i, pGT @@ -86,7 +86,7 @@ FUNCTION ExecBrowser( oCrt ) BrwBuildMenu( oCrt ) oTBar := BrwBuildToolBar( oCrt ) - oTBar:buttonClick := {|oBtn| Vou_ExecTBarAction( oBtn ) } + oTBar:buttonClick := {| oBtn | Vou_ExecTBarAction( oBtn ) } SetMode( maxrow()+1, maxCol()+1 ) /* Neccessary because adding menu has reduced the overall size of window */ @@ -119,9 +119,9 @@ FUNCTION ExecBrowser( oCrt ) oBrowse:ColSep := " " oBrowse:HeadSep := "__" - oBrowse:GoTopBlock := { || dbGoTop() } - oBrowse:GoBottomBlock := { || dbGoBottom() } - oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip,oBrowse ) } + oBrowse:GoTopBlock := {|| dbGoTop() } + oBrowse:GoBottomBlock := {|| dbGoBottom() } + oBrowse:SkipBlock := {| nSkip | dbSkipBlock( nSkip,oBrowse ) } for i := 1 to len( info_ ) bBlock := VouBlockField( i ) @@ -228,7 +228,7 @@ FUNCTION ExecBrowser( oCrt ) RETURN NIL -//-------------------------------------------------------------------// +// STATIC FUNCTION BrwHandleResize( oCrt, oBrw, oVBar, oHBar, oCom, oSLE, oLBx, oTre, oChk, aNvg, oIdx, lActiveX, cFileDbf ) @@ -274,7 +274,7 @@ STATIC FUNCTION BrwHandleResize( oCrt, oBrw, oVBar, oHBar, oCom, oSLE, oLBx, oTr RETURN .t. -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwShowColumn( oBrw, cHeading ) LOCAL i, j, nCur @@ -299,7 +299,7 @@ STATIC FUNCTION BrwShowColumn( oBrw, cHeading ) RETURN NIL -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildTree( oCrt /*, oBrw*/ ) LOCAL oTree, oItem1, oItem2 @@ -311,7 +311,7 @@ STATIC FUNCTION BrwBuildTree( oCrt /*, oBrw*/ ) oTree:create( , , { -24, -1 }, { {|| -( maxrow()-1-24 ) }, -10 } ) oTree:setColorFG( "W+" ) oTree:setColorBG( "R*" ) - oTree:itemSelected := {|oItem| WVG_MessageBox( , iif( oItem != NIL, oItem:caption, "Some Problem" ) ) } + oTree:itemSelected := {| oItem | WVG_MessageBox( , iif( oItem != NIL, oItem:caption, "Some Problem" ) ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -331,7 +331,7 @@ STATIC FUNCTION BrwBuildTree( oCrt /*, oBrw*/ ) RETURN oTree -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildActiveX( oCrt, oBrw ) LOCAL oCom @@ -346,7 +346,7 @@ STATIC FUNCTION BrwBuildActiveX( oCrt, oBrw ) RETURN oCom -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildListBox( oCrt, oBrw ) LOCAL oXbp, i @@ -355,7 +355,7 @@ STATIC FUNCTION BrwBuildListBox( oCrt, oBrw ) oXbp:create( , , { -4,-1 }, { -10, -10 }, , .t. ) oXbp:setColorFG( "W+" ) oXbp:setColorBG( "B*" ) - oXbp:itemMarked := {|m1,m2,o| m1 := m1, m2 := m2, BrwShowColumn( oBrw, o:getCurItem() ) } + oXbp:itemMarked := {| m1, m2, o | m1 := m1, m2 := m2, BrwShowColumn( oBrw, o:getCurItem() ) } FOR i := 1 TO oBrw:colCount oXbp:addItem( oBrw:getColumn( i ):heading ) NEXT @@ -364,7 +364,7 @@ STATIC FUNCTION BrwBuildListBox( oCrt, oBrw ) RETURN oXbp -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwSetThisOrder( oBrw, nOrd ) DbSetOrder( nOrd ) @@ -372,7 +372,7 @@ STATIC FUNCTION BrwSetThisOrder( oBrw, nOrd ) oBrw:forceStable() RETURN NIL -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildListBoxIdx( oCrt, oBrw ) LOCAL oXbp, i, cKey, aIdx := {} @@ -389,7 +389,7 @@ STATIC FUNCTION BrwBuildListBoxIdx( oCrt, oBrw ) oXbp:create( , , { -18,-1 }, { -5, -10 }, , .t. ) oXbp:setColorFG( "W+" ) oXbp:setColorBG( "B*" ) - oXbp:itemMarked := {|m1,m2,o| m1 := m2, BrwSetThisOrder( oBrw, o:XbpListBox:getData()-1 ) } + oXbp:itemMarked := {| m1, m2, o | m1 := m2, BrwSetThisOrder( oBrw, o:XbpListBox:getData()-1 ) } oXbp:addItem( "Natural Order" ) FOR i := 1 TO len( aIdx ) oXbp:addItem( aIdx[ i ] ) @@ -398,7 +398,7 @@ STATIC FUNCTION BrwBuildListBoxIdx( oCrt, oBrw ) RETURN oXbp -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildSLE( oCrt, oBrw ) LOCAL oXbp @@ -415,12 +415,12 @@ STATIC FUNCTION BrwBuildSLE( oCrt, oBrw ) oXbp:create( , , { -16, -1 }, { -1, -10 } ) oXbp:setColorFG( "N" ) oXbp:setColorBG( "BG+" ) - oXbp:returnPressed := {|m1,m2,o| m1:=m1, m2:=m2, BrwShowColumn( oBrw, upper( trim( o:getData() ) ) ) } + oXbp:returnPressed := {| m1, m2, o | m1:=m1, m2:=m2, BrwShowColumn( oBrw, upper( trim( o:getData() ) ) ) } oXbp:tooltipText := "Type in a field name and press ENTER" RETURN oXbp -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildNvg( oCrt, oBrw, oCom ) LOCAL oLbl, oXbp @@ -440,13 +440,13 @@ STATIC FUNCTION BrwBuildNvg( oCrt, oBrw, oCom ) oXbp:create( , , { -23, -19 }, { -1, {|| -( maxcol()-1-19 ) } }, , .f. ) oXbp:setColorFG( "N" ) oXbp:setColorBG( "BG+" ) - oXbp:returnPressed := {|m1,m2,o| m1:=m2, oCom:navigate( trim( o:getData() ) ) } + oXbp:returnPressed := {| m1, m2, o | m1:=m2, oCom:navigate( trim( o:getData() ) ) } oXbp:tooltipText := "Type-in a http:// address and press ENTER" oXbp:setData( "http://hbide.vouch.info/" ) RETURN { oLbl, oXbp } -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildCheckBox( oCrt, oBrw, lActiveX ) LOCAL oXbp @@ -456,7 +456,7 @@ STATIC FUNCTION BrwBuildCheckBox( oCrt, oBrw, lActiveX ) oXbp := WvgCheckBox():new( oCrt ) oXbp:pointerFocus := .f. oXbp:caption := "ActiveX" - oXbp:selected := {|x,y,o| x := y, lActiveX := o:getData(), Wvt_Keyboard( HB_K_RESIZE ) } + oXbp:selected := {| x, y, o | x := y, lActiveX := o:getData(), Wvt_Keyboard( HB_K_RESIZE ) } oXbp:selection := .f. oXbp:create( , , { -23,-1 }, { -1,-10 } ) oXbp:setColorFG( "R+" ) @@ -465,7 +465,7 @@ STATIC FUNCTION BrwBuildCheckBox( oCrt, oBrw, lActiveX ) RETURN oXbp -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwReposButtons( oCrt ) LOCAL oXbp, nOff, nTtl, nG, i @@ -473,7 +473,7 @@ STATIC FUNCTION BrwReposButtons( oCrt ) nG := 2 nTtl := 0 - aeval( aW, {|e| nTtl += e } ) + aeval( aW, {| e | nTtl += e } ) nTtl += ( len( aW ) - 1 ) * nG nOff := ( ( maxcol()+1 ) - nTtl ) / 2 @@ -488,7 +488,7 @@ STATIC FUNCTION BrwReposButtons( oCrt ) RETURN NIL -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildButtons( oCrt, oBrw ) LOCAL oPB, nOff, nTtl, nG, i @@ -502,7 +502,7 @@ STATIC FUNCTION BrwBuildButtons( oCrt, oBrw ) nG := 2 nTtl := 0 - aeval( aW, {|e| nTtl += e } ) + aeval( aW, {| e | nTtl += e } ) nTtl += ( len( aW ) - 1 ) * nG nOff := ( ( maxcol()+1 ) - nTtl ) / 2 @@ -528,7 +528,7 @@ STATIC FUNCTION BrwBuildButtons( oCrt, oBrw ) RETURN NIL -/*----------------------------------------------------------------------*/ +// FUNCTION Vou_BrwAddScrollBars( oCrt, oBrw, oVBar, oHBar ) @@ -537,18 +537,18 @@ FUNCTION Vou_BrwAddScrollBars( oCrt, oBrw, oVBar, oHBar ) oHBar:range := { 1, oBrw:colCount } oHBar:type := WVGSCROLL_HORIZONTAL oHBar:create() - oHBar:scroll := {|mp1| oBrw:colPos := mp1[ 1 ], oBrw:refreshCurrent(), oBrw:forceStable() } + oHBar:scroll := {| mp1 | oBrw:colPos := mp1[ 1 ], oBrw:refreshCurrent(), oBrw:forceStable() } oVBar := WvgScrollBar():new( oCrt, , { {|| -( oBrw:nTop ) }, {|| -( oBrw:nRight+1 ) } }, ; { {|| -( oBrw:nBottom-oBrw:nTop+1 ) }, {|| -( 2 ) } } ) oVBar:range := { 1, LastRec() } oVBar:type := WVGSCROLL_VERTICAL oVBar:create() - oVBar:scroll := {|mp1| Vou_BrwSetVScroll( mp1, oBrw ) } + oVBar:scroll := {| mp1 | Vou_BrwSetVScroll( mp1, oBrw ) } RETURN NIL -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwBuildMenu( oCrt ) LOCAL oMenu, oSMenu @@ -573,13 +573,13 @@ STATIC FUNCTION BrwBuildMenu( oCrt ) oSMenu:title := "~Procedural" oSMenu:addItem( { "Procedure ~1", } ) oSMenu:addItem( { "Procedure ~2", } ) - oSMenu:itemSelected := {|mp1| MyMenuProcedure( 100+mp1 ) } + oSMenu:itemSelected := {| mp1 | MyMenuProcedure( 100+mp1 ) } oSMenu:checkItem( 2 ) oMenu:addItem( { oSMenu, NIL } ) RETURN oMenu -//----------------------------------------------------------------------// +// STATIC FUNCTION BrwBuildToolBar( oCrt ) LOCAL oTBar, nRGB := RGB( 172,172,172 ) @@ -610,9 +610,9 @@ STATIC FUNCTION BrwBuildToolBar( oCrt ) RETURN oTBar -//----------------------------------------------------------------------// +// // Key Handelling -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwHandleKey( oBrowse, nKey, lEnd ) LOCAL lVMove := .f. @@ -703,7 +703,7 @@ STATIC FUNCTION BrwHandleKey( oBrowse, nKey, lEnd ) RETURN lRet -/*----------------------------------------------------------------------*/ +// FUNCTION Vou_NavigateToCell( oBrowse ) LOCAL nCount @@ -747,7 +747,7 @@ FUNCTION Vou_NavigateToCell( oBrowse ) RETURN .f. -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION DbSkipBlock( n ) LOCAL nSkipped := 0 @@ -767,7 +767,7 @@ STATIC FUNCTION DbSkipBlock( n ) RETURN nSkipped -//-------------------------------------------------------------------// +// STATIC FUNCTION TBNext() LOCAL nSaveRecNum := recno() @@ -785,7 +785,7 @@ STATIC FUNCTION TBNext() RETURN lMoved -//-------------------------------------------------------------------// +// STATIC FUNCTION TBPrev() LOCAL nSaveRecNum := Recno() @@ -800,12 +800,12 @@ STATIC FUNCTION TBPrev() RETURN lMoved -//-------------------------------------------------------------------// +// STATIC FUNCTION VouBlockField( i ) RETURN {|| fieldget( i ) } -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION Vou_ExecTBarAction( oBtn ) @@ -828,7 +828,7 @@ STATIC FUNCTION Vou_ExecTBarAction( oBtn ) RETURN NIL -/*----------------------------------------------------------------------*/ +// FUNCTION Vou_BrwSetVScroll( mp1, oBrowse ) @@ -872,9 +872,9 @@ FUNCTION Vou_BrwSetVScroll( mp1, oBrowse ) RETURN NIL -/*----------------------------------------------------------------------*/ +// /* For brosers inside WvtDialog() */ -/*----------------------------------------------------------------------*/ +// STATIC FUNCTION BrwOnEvent( oWvtBrw, cPaintID, oBrowse, nKey ) LOCAL lRet := .t., lRefAll := .f. @@ -982,7 +982,7 @@ STATIC FUNCTION BrwOnEvent( oWvtBrw, cPaintID, oBrowse, nKey ) RETURN lRet -//-------------------------------------------------------------------// +// FUNCTION ConfigBrowser( aFields, cUseAlias, aTLBR, cDesc, oParent, cColorSpec, nID ) LOCAL info_, oWvtBrw, oBrowse, i, bBlock @@ -1003,9 +1003,9 @@ FUNCTION ConfigBrowser( aFields, cUseAlias, aTLBR, cDesc, oParent, cColorSpec, n oBrowse:ColSep := " " oBrowse:HeadSep := "__" oBrowse:ColorSpec := cColorSpec - oBrowse:GoTopBlock := { || dbGoTop() } - oBrowse:GoBottomBlock := { || dbGoBottom() } - oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip,oBrowse ) } + oBrowse:GoTopBlock := {|| dbGoTop() } + oBrowse:GoBottomBlock := {|| dbGoBottom() } + oBrowse:SkipBlock := {| nSkip | dbSkipBlock( nSkip,oBrowse ) } FOR i := 1 TO len( aFields ) bBlock := VouBlockField( aFields[ i ] ) @@ -1028,8 +1028,8 @@ FUNCTION ConfigBrowser( aFields, cUseAlias, aTLBR, cDesc, oParent, cColorSpec, n oWvtBrw:Tooltip := cDesc oWvtBrw:aPopup := aPopup - oWvtBrw:bHandleEvent := {|oWvtBrw,cPaintID,oBrowse,nKey| BrwOnEvent( oWvtBrw,cPaintID,oBrowse,nKey ) } + oWvtBrw:bHandleEvent := {| oWvtBrw, cPaintID, oBrowse, nKey | BrwOnEvent( oWvtBrw,cPaintID,oBrowse,nKey ) } RETURN oWvtBrw -//-------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/tests/utils.prg b/harbour/contrib/gtwvg/tests/utils.prg index fe94a35969..3561a32097 100644 --- a/harbour/contrib/gtwvg/tests/utils.prg +++ b/harbour/contrib/gtwvg/tests/utils.prg @@ -5,7 +5,7 @@ /* * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -14,7 +14,7 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// // // WvtSetObjects() array structure // @@ -46,12 +46,12 @@ #define OBJ_STATE_BUTTONDOWN 3 #define OBJ_STATE_BUTTONUP 4 -/*----------------------------------------------------------------------*/ +// THREAD STATIC t_keys_:= { , , , , , , , , , , , , , , , , , , , } THREAD STATIC t_pic_ := { , , , , , , , , , , , , , , , , , , , } -/*----------------------------------------------------------------------*/ +// FUNCTION WvtSetKeys( lSet ) @@ -78,23 +78,23 @@ FUNCTION WvtSetKeys( lSet ) ENDIF RETURN Nil -//-------------------------------------------------------------------// +// // Wvt_Paint() must be a FUNCTION in your application // as it is called when Window gets WM_PAINT message. -//-------------------------------------------------------------------// +// FUNCTION Wvt_Paint() LOCAL aBlocks := WvtSetBlocks() - aEval( aBlocks, {|e| eval( e ) } ) + aEval( aBlocks, {| e | eval( e ) } ) WvtPaintObjects() RETURN 0 -//-------------------------------------------------------------------// +// // Wvt_SetFocus() must be a FUNCTION in your application // needs to process messages sent through WM_SETFOCUS message // received by the window. -//-------------------------------------------------------------------// +// #if 0 FUNCTION Wvt_SetFocus() @@ -107,11 +107,11 @@ FUNCTION Wvt_SetFocus() RETURN nil #endif -//-------------------------------------------------------------------// +// // Wvt_KillFocus() must be a FUNCTION in your application // needs to process messages sent through WM_KILLFOCUS message // received by the window. -//-------------------------------------------------------------------// +// #if 0 FUNCTION Wvt_KillFocus() LOCAL nRow := row() @@ -124,12 +124,12 @@ FUNCTION Wvt_KillFocus() RETURN NIL #endif -//-------------------------------------------------------------------// +// // // Wvt_Mouse() must be present if you want to catch and fire // mouse call back outside of the inkey() loop. // -//-------------------------------------------------------------------// +// FUNCTION Wvt_Mouse( nKey, nRow, nCol ) LOCAL nLen, aObjects := WvtSetObjects() @@ -164,10 +164,10 @@ FUNCTION Wvt_Mouse( nKey, nRow, nCol ) RETURN NIL ENDIF - nObj := ascan( aObjects, {|e_| e_[ WVT_OBJ_ROW ] <= nRow .AND. ; - e_[ WVT_OBJ_ROWTO ] >= nRow .AND. ; - e_[ WVT_OBJ_COL ] <= nCol .AND. ; - e_[ WVT_OBJ_COLTO ] >= nCol } ) + nObj := ascan( aObjects, {| e_ | e_[ WVT_OBJ_ROW ] <= nRow .AND. ; + e_[ WVT_OBJ_ROWTO ] >= nRow .AND. ; + e_[ WVT_OBJ_COL ] <= nCol .AND. ; + e_[ WVT_OBJ_COLTO ] >= nCol } ) IF nObj == 0 IF nLastObj > 0 aObjects[ nLastObj, WVT_OBJ_STATE ] := OBJ_STATE_DISP @@ -209,9 +209,9 @@ FUNCTION Wvt_Mouse( nKey, nRow, nCol ) RETURN NIL -//-------------------------------------------------------------------// +// // WvtSetBlocks() is a get/set FUNCTION to be used by Wvt_Paint() -//-------------------------------------------------------------------// +// FUNCTION WvtSetBlocks( a_ ) LOCAL o @@ -225,9 +225,9 @@ FUNCTION WvtSetBlocks( a_ ) RETURN o -//-------------------------------------------------------------------// +// // WvtSetObjects() is a get/set FUNCTION to be used by Wvt_Mouse() -//-------------------------------------------------------------------// +// FUNCTION WvtSetObjects( aObject ) LOCAL oObjects @@ -241,7 +241,7 @@ FUNCTION WvtSetObjects( aObject ) aObjects := {} ELSE IF valtype( aObject[ 1 ] ) == "A" - aeval( aObject, {|e_| aadd( aObjects, e_ ) } ) + aeval( aObject, {| e_ | aadd( aObjects, e_ ) } ) ELSE aSize( aObject, WVT_OBJ_VRBLS ) @@ -254,7 +254,7 @@ FUNCTION WvtSetObjects( aObject ) RETURN oObjects -//-------------------------------------------------------------------// +// FUNCTION SetMouseCheck( lYes ) LOCAL lOYes @@ -265,7 +265,7 @@ FUNCTION SetMouseCheck( lYes ) ENDIF RETURN lOYes -//-------------------------------------------------------------------// +// FUNCTION WvtWindowExpand( nUnits ) @@ -277,12 +277,12 @@ FUNCTION WvtWindowExpand( nUnits ) RETURN .t. -//-------------------------------------------------------------------// +// FUNCTION rgb( r,g,b ) RETURN r + ( g * 256 ) + ( b * 256 * 256 ) -//-------------------------------------------------------------------// +// FUNCTION VouChoice( aChoices ) LOCAL scr, clr, nChoice @@ -299,13 +299,13 @@ FUNCTION VouChoice( aChoices ) RETURN nChoice -//-------------------------------------------------------------------// +// FUNCTION Hb_Clear() CLS RETURN .f. -//----------------------------------------------------------------------// +// FUNCTION MyMenuProcedure( nID ) DO CASE @@ -316,7 +316,7 @@ FUNCTION MyMenuProcedure( nID ) ENDCASE RETURN .t. -//----------------------------------------------------------------------// +// FUNCTION BuildWvgToolBar( oDA, nActiveX ) LOCAL oTBar @@ -349,7 +349,7 @@ FUNCTION BuildWvgToolBar( oDA, nActiveX ) RETURN oTBar -//----------------------------------------------------------------------// +// FUNCTION SetGT( nIndex, pGT ) LOCAL oldGT @@ -360,7 +360,7 @@ FUNCTION SetGT( nIndex, pGT ) ENDIF RETURN oldGT -/*----------------------------------------------------------------------*/ +// FUNCTION SetFonts( hFont ) LOCAL oldFont @@ -371,7 +371,7 @@ FUNCTION SetFonts( hFont ) ENDIF RETURN oldFont -/*----------------------------------------------------------------------*/ +// FUNCTION SetIcons( hIcon ) LOCAL oldIcon @@ -382,7 +382,7 @@ FUNCTION SetIcons( hIcon ) ENDIF RETURN oldIcon -/*----------------------------------------------------------------------*/ +// FUNCTION Popups( nID, lDestroy ) LOCAL hPop, hPop1 @@ -452,7 +452,7 @@ FUNCTION Popups( nID, lDestroy ) RETURN Wvt_SetPopupMenu( hPop_[ nID ] ) -//-------------------------------------------------------------------// +// FUNCTION DispStatusMsg( cMsg ) @@ -460,7 +460,7 @@ FUNCTION DispStatusMsg( cMsg ) RETURN .t. -//-------------------------------------------------------------------// +// FUNCTION ClearStatusMsg() LOCAL nRow := Row() @@ -472,7 +472,7 @@ FUNCTION ClearStatusMsg() RETURN .t. -//-------------------------------------------------------------------// +// FUNCTION WvtPictures( nSlot,cFilePic ) @@ -486,7 +486,7 @@ FUNCTION WvtPictures( nSlot,cFilePic ) RETURN NIL -//-------------------------------------------------------------------// +// FUNCTION WvtExePicture( nTop, nLeft, nBottom, nRight, nSlot, aOffset ) @@ -496,24 +496,24 @@ FUNCTION WvtExePicture( nTop, nLeft, nBottom, nRight, nSlot, aOffset ) RETURN NIL -/*----------------------------------------------------------------------*/ +// FUNCTION GetResource( cName ) RETURN hb_dirBase() + cName -/*----------------------------------------------------------------------*/ +// FUNCTION uiDebug( ... ) LOCAL aP := hb_aParams() LOCAL s := "" - aeval( aP, {|e| s += hb_valTOstr( e ) + " " } ) + aeval( aP, {| e | s += hb_valTOstr( e ) + " " } ) WAPI_OutputDebugString( s ) RETURN NIL -/*----------------------------------------------------------------------*/ +// FUNCTION MyError( oError ) @@ -528,5 +528,4 @@ FUNCTION MyError( oError ) RETURN NIL -/*----------------------------------------------------------------------*/ - +// diff --git a/harbour/contrib/gtwvg/tests/wvtcls.prg b/harbour/contrib/gtwvg/tests/wvtcls.prg index 04acef2634..361b03b0ba 100644 --- a/harbour/contrib/gtwvg/tests/wvtcls.prg +++ b/harbour/contrib/gtwvg/tests/wvtcls.prg @@ -11,7 +11,7 @@ * * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -20,11 +20,11 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// #define CRLF chr( 13 )+chr( 10 ) -/*----------------------------------------------------------------------*/ +// FUNCTION DialogWvgClassesOne( nMode ) Local bBlock @@ -33,7 +33,7 @@ FUNCTION DialogWvgClassesOne( nMode ) if nMode == 2 MyDialogOne() else - bBlock := { |oCrt| ; + bBlock := {| oCrt | ; oCrt := WvgCrt():New( , , { -1,-1 }, { 54,184 }, , .f. ), ; oCrt:fontName := 'Courier',; oCrt:fontHeight := 13 ,; @@ -49,7 +49,7 @@ FUNCTION DialogWvgClassesOne( nMode ) endif RETURN NIL -//----------------------------------------------------------------------// +// STATIC FUNCTION MyDialogOne( oCrt ) LOCAL aObjects:= WvtSetBlocks( {} ) @@ -332,7 +332,7 @@ STATIC FUNCTION MyDialogOne( oCrt ) RETURN Nil -//-------------------------------------------------------------------// +// FUNCTION DialogWvgClassesTwo() LOCAL aObjects := WvtSetBlocks( {} ) @@ -392,7 +392,7 @@ FUNCTION DialogWvgClassesTwo() WvtSetBlocks( aObjects ) RETURN Nil -//-------------------------------------------------------------------// +// STATIC FUNCTION ExeProgBar( oPBar,oPBar1,oPBar2,oPBar3,oPBar4 ) LOCAL i @@ -418,7 +418,8 @@ STATIC FUNCTION ExeProgBar( oPBar,oPBar1,oPBar2,oPBar3,oPBar4 ) oPBar4:DeActivate() RETURN nil -//-------------------------------------------------------------------// + +// STATIC FUNCTION ExeProgressBar( oPBar, oPBar3 ) LOCAL i @@ -435,4 +436,4 @@ STATIC FUNCTION ExeProgressBar( oPBar, oPBar3 ) RETURN NIL -//-------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/tests/xbp.prg b/harbour/contrib/gtwvg/tests/xbp.prg index eb3bd4c612..8a890ce232 100644 --- a/harbour/contrib/gtwvg/tests/xbp.prg +++ b/harbour/contrib/gtwvg/tests/xbp.prg @@ -6,7 +6,7 @@ * Pritpal Bedi */ -/*----------------------------------------------------------------------*/ +// #include "inkey.ch" #include "common.ch" @@ -15,15 +15,15 @@ #include "hbgtwvg.ch" #include "wvgparts.ch" -/*----------------------------------------------------------------------*/ +// #define MUSIC_WAITON {800, 1600} -/*----------------------------------------------------------------------*/ +// // // A Pure Xbase++ Implementation // -//----------------------------------------------------------------------// +// FUNCTION demoxbp() Local oCrt, oTBar, oSBar, oStatic, oCom, oXbp, oTree, oItem1, oItem2 @@ -51,7 +51,7 @@ FUNCTION demoxbp() //--------------------------- StatusBar ---------------------------\\ oSBar := WvgStatusBar():new( oCrt ):create( , , , , , .t. ) - oSBar:panelClick := {|oPanel| WVG_MessageBox( , oPanel:caption ) } + oSBar:panelClick := {| oPanel | WVG_MessageBox( , oPanel:caption ) } oPanel := oSBar:getItem( 1 ) oPanel:caption := 'My Root Panel' oPanel1 := oSBar:addItem() @@ -99,7 +99,7 @@ FUNCTION demoxbp() aadd( aParts, '-------------' ) aadd( aParts, 'DataRef' ) - aeval( aParts, {|e| oListBox:addItem( e ) } ) + aeval( aParts, {| e | oListBox:addItem( e ) } ) oListBox:itemSelected := {|| WVG_MessageBox( , oListBox:getCurItem() ) } oListBox:setData( 3 ) // show selected 'XbpToolBar' @@ -120,7 +120,7 @@ FUNCTION demoxbp() oTree:create() oTree:setColorBG( RGB( 120,15,240 ) ) oTree:setColorFG( RGB( 15,240,120 ) ) - oTree:itemSelected := {|oItem| iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } + oTree:itemSelected := {| oItem | iif( oItem != NIL, WVG_MessageBox( , oItem:caption ), NIL ) } oItem1 := oTree:rootItem:addItem( "First level A" ) @@ -149,8 +149,8 @@ FUNCTION demoxbp() oCom:mapEvent( 269, {|| QOut( ' E X P L O R E R - 2 6 9' ) } ) #else oCom := WvgHTMLViewer():New( oDA, , { 0, 0 }, { 100, 100 }, , .t. ) - oCom:beforeNavigate := {|cURL, x, oHTML| x := x, oHTML := oHTML, oPanel:caption := cURL } - oCom:statusTextChange := {|cText| oPanel:caption := cText } + oCom:beforeNavigate := {| cURL, x, oHTML | x := x, oHTML := oHTML, oPanel:caption := cURL } + oCom:statusTextChange := {| cText | oPanel:caption := cText } oCom:mapEvent( 112, {|| oPanel:caption := ' E X P L O R E R - 2 6 9' } ) #endif oCom:create() @@ -160,12 +160,12 @@ FUNCTION demoxbp() oAddr:bufferLength := 500 oAddr:border := .t. cNavigate := 'http://www.harbour.vouch.info' - oAddr:dataLink := {|x| iif( x == NIL, cNavigate, cNavigate := x ) } + oAddr:dataLink := {| x | iif( x == NIL, cNavigate, cNavigate := x ) } oAddr:setColorFG( RGB( 0,0,255 ) ) oAddr:setColorBG( RGB( 0,255,255 ) ) oAddr:create( oDA, , { 120, oTBar:currentSize()[2] }, { 500,20 }, , .t. ) oAddr:setData() - oAddr:killInputFocus := {|m1,m2,oS| m1:=m1, m2:=m2, oS:getData(), oCom:navigate( cNavigate ) } + oAddr:killInputFocus := {| m1, m2, oS | m1:=m1, m2:=m2, oS:getData(), oCom:navigate( cNavigate ) } //----------------- Panel : Static + Radio + Checkbox ----------\\ oStatic2:= WvgStatic():New( oDA, , { 150, 150 }, { 500,310 }, , .f. ) @@ -184,7 +184,7 @@ FUNCTION demoxbp() oRadio := WvgRadioButton():new( oStatic2,, { 10,10 }, { 100,15 } ) oRadio:caption := "Com 1" oRadio:selection := .T. - oRadio:selected := {|m1,m2,obj| m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + iif( obj:selection, '< S >', '< N >' ) ) } + oRadio:selected := {| m1, m2, obj | m1:=m1, m2:=m2, WVG_MessageBox( , obj:caption + iif( obj:selection, '< S >', '< N >' ) ) } oRadio:create() oRadio := WvgRadioButton():new( oStatic2,, { 10,35 }, { 100,15 } ) @@ -194,21 +194,21 @@ FUNCTION demoxbp() oCheck := WvgCheckBox():New( oStatic2, , { 10,70 }, { 100,15 }, , .t. ) oCheck:caption := 'Checkbox A' oCheck:create() - oCheck:selected := {|m1,m2,o| m1:=m1,m2:=m2, WVG_MessageBox( , iif( o:getData(), 'I am selected','I am not selected' ) ) } + oCheck:selected := {| m1, m2, o | m1:=m1,m2:=m2, WVG_MessageBox( , iif( o:getData(), 'I am selected','I am not selected' ) ) } // Create first 3State button, passing the position to :create() oXbp := Wvg3State():new() oXbp:caption := "3 State A" oXbp:create( oStatic2, , { 10,100 }, { 100,15 } ) // Determine current state using mp1 - oXbp:selected := {| m1,m2,oBtn | m2:=m2, oBtn:=oBtn, oPanel1:caption := "3State A ["+aState[ m1+1 ]+"]" } + oXbp:selected := {| m1, m2, oBtn | m2:=m2, oBtn:=oBtn, oPanel1:caption := "3State A ["+aState[ m1+1 ]+"]" } // Create second 3State Button, passing the position to :new() oXbp := Wvg3State():new( oStatic2, , { 10,125 }, { 100,15 } ) oXbp:caption := "3 State B" oXbp:create( oStatic2 ) // Determine current state using :getData() - oXbp:selected := {| m1,m2,oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) } + oXbp:selected := {| m1, m2, oBtn | m1:=m1,m2:=m2, WVG_MessageBox( , "3State B", aState[ oBtn:getData()+1 ] ) } // Create first SLE, specify position using :create() // On :typeOut set the focus to the second SLE @@ -216,20 +216,20 @@ FUNCTION demoxbp() oXbp:autoTab := .T. oXbp:bufferLength := 20 // Data code block containing assignment to LOCAL variable - oXbp:dataLink := {|x| iif( x == NIL, cVarA, cVarA := x ) } + oXbp:dataLink := {| x | iif( x == NIL, cVarA, cVarA := x ) } oXbp:create( oStatic2, , { 10,170 }, { 150,20 } ) oXbp:setData() // Assign the value of the edit buffer to a LOCAL variable when the input focus is lost - oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarA =" + cVarA } + oXbp:killInputFocus := {| x, y, oSLE | x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarA =" + cVarA } // Create second SLE, specify position using :new() oXbp := WvgSLE():new( , , { 10,200 }, { 150,20 } ) oXbp:tabStop := .T. oXbp:bufferLength := 15 - oXbp:dataLink := {|x| iif( x == NIL, cVarB, cVarB := x ) } + oXbp:dataLink := {| x | iif( x == NIL, cVarB, cVarB := x ) } oXbp:create( oStatic2 ) oXbp:setData() - oXbp:killInputFocus := { |x,y,oSLE| x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB } + oXbp:killInputFocus := {| x, y, oSLE | x:=x,y:=y, oSLE:getData(), oPanel:caption := "cVarB =" + cVarB } // Read file into LOCAL variable cText := MemoRead( GetResource( 'gtwvg.hbc' ) ) @@ -238,18 +238,18 @@ FUNCTION demoxbp() oMLE := WvgMLE():new() oMLE:wordWrap := .F. oMLE:border := .t. - oMLE:dataLink := {|x| iif( x==NIL, cText, cText := x ) } + oMLE:dataLink := {| x | iif( x==NIL, cText, cText := x ) } oMLE:create( oStatic2, , { 180,10 }, { 310,250 } ) // Copy text from LOCAL variable into edit buffer via :dataLink oMLE:setData() //--------------------------- Misc Config ------------------------\\ - oTBar:buttonClick := {|oBtn| iif( oBtn:caption == 'Hide' , oStatic:hide(), nil ),; - iif( oBtn:caption == 'Show' , oStatic:show(), nil ),; - iif( oBtn:caption == 'Tools' , oStatic2:show():toFront(), nil ),; - iif( oBtn:caption == 'FontDlg', ExeFontDialogXbp( oCrt ), nil ),; - iif( oBtn:caption $ 'Hide,Show', oCrt:sendMessage( WM_SIZE, 0, 0 ), NIL ),; - oPanel2:caption := "Button [ " + oBtn:caption + " ] clicked!" } + oTBar:buttonClick := {| oBtn | iif( oBtn:caption == 'Hide' , oStatic:hide(), nil ),; + iif( oBtn:caption == 'Show' , oStatic:show(), nil ),; + iif( oBtn:caption == 'Tools' , oStatic2:show():toFront(), nil ),; + iif( oBtn:caption == 'FontDlg', ExeFontDialogXbp( oCrt ), nil ),; + iif( oBtn:caption $ 'Hide,Show', oCrt:sendMessage( WM_SIZE, 0, 0 ), NIL ),; + oPanel2:caption := "Button [ " + oBtn:caption + " ] clicked!" } oCrt:resize := {|| ResizeDialogXbp( oCrt, oTBar, oSBar, oStatic, oCom, oTree, oAddr ) } @@ -266,7 +266,7 @@ FUNCTION demoxbp() Return nil -//----------------------------------------------------------------------// +// STATIC FUNCTION ResizeDialogXbp( oCrt, oTBar, oSBar, oStatic, oCom, oTree, oAddr ) LOCAL aCrt, aTBar, aSBar @@ -294,7 +294,7 @@ STATIC FUNCTION ResizeDialogXbp( oCrt, oTBar, oSBar, oStatic, oCom, oTree, oAddr RETURN 1 -//----------------------------------------------------------------------// +// STATIC FUNCTION ActiveXBuildMenuXbp( oCrt, oStatic, oStatic2 ) Local oMenuBar, oSubMenu @@ -309,7 +309,7 @@ STATIC FUNCTION ActiveXBuildMenuXbp( oCrt, oStatic, oStatic2 ) oSubMenu:title := "~Procedural" oSubMenu:addItem( { "Play Charge ~1", } ) oSubMenu:addItem( { "Play Nannyboo ~2", } ) - oSubMenu:itemSelected := {|mp1| MyFunctionXbp( 100+mp1 ) } + oSubMenu:itemSelected := {| mp1 | MyFunctionXbp( 100+mp1 ) } oMenuBar:addItem( { oSubMenu, NIL } ) // Define submenu in the functional style: @@ -334,7 +334,7 @@ STATIC FUNCTION ActiveXBuildMenuXbp( oCrt, oStatic, oStatic2 ) oMenuBar:addItem( { oSubMenu, NIL } ) RETURN NIL -//----------------------------------------------------------------------// +// STATIC FUNCTION ActiveXBuildToolBarXbp( oCrt ) LOCAL oTBar @@ -367,7 +367,7 @@ STATIC FUNCTION ActiveXBuildToolBarXbp( oCrt ) RETURN oTBar -//----------------------------------------------------------------------// +// Static Function MyFunctionXbp( nMode ) @@ -387,7 +387,7 @@ Static Function MyFunctionXbp( nMode ) Eval( {|| tone(523,2),tone(698,2),tone(880,2),tone(1046,4),tone(880,2),tone(1046,8) } ) case nMode == 102 // NannyBoo - AEval( {{196,2},{196,2},{164,2},{220,2},{196,4},{164,4}}, {|a| tone(a[1],a[2]) } ) + AEval( {{196,2},{196,2},{164,2},{220,2},{196,4},{164,4}}, {| a | tone( a[ 1 ], a[ 2 ] ) } ) case nMode == 103 // BADKEY tone( 480,0.25 ) @@ -397,7 +397,7 @@ Static Function MyFunctionXbp( nMode ) Return nil -//----------------------------------------------------------------------// +// STATIC FUNCTION ExeFontDialogXbp( oCrt ) LOCAL oFontDlg @@ -428,4 +428,4 @@ STATIC FUNCTION ExeFontDialogXbp( oCrt ) RETURN nil -//----------------------------------------------------------------------// +// diff --git a/harbour/contrib/gtwvg/toolbar.prg b/harbour/contrib/gtwvg/toolbar.prg index 306861fbe2..859023caa3 100644 --- a/harbour/contrib/gtwvg/toolbar.prg +++ b/harbour/contrib/gtwvg/toolbar.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 23Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/ @@ -127,7 +127,7 @@ CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/ ENDCLASS -/*-*/ +// METHOD WvgToolBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -144,7 +144,7 @@ METHOD WvgToolBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgToolBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -200,7 +200,7 @@ METHOD WvgToolBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgToolBar:handleEvent( nMessage, aNM ) LOCAL nObj, aNMMouse @@ -223,7 +223,7 @@ METHOD WvgToolBar:handleEvent( nMessage, aNM ) DO CASE CASE aNMMouse[ NMH_code ] == NM_CLICK - IF ( nObj := ascan( ::aItems, {|e_| e_[ 1 ] == aNMMouse[ NMH_dwItemSpec ] } ) ) > 0 + IF ( nObj := ascan( ::aItems, {| e_ | e_[ 1 ] == aNMMouse[ NMH_dwItemSpec ] } ) ) > 0 IF HB_ISBLOCK( ::sl_lbClick ) IF ::isParentCrt() ::oParent:setFocus() @@ -244,7 +244,7 @@ METHOD WvgToolBar:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgToolBar:destroy() LOCAL i, nItems @@ -271,7 +271,7 @@ METHOD WvgToolBar:destroy() RETURN NIL -/*-*/ +// METHOD WvgToolBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -279,13 +279,13 @@ METHOD WvgToolBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgToolBar:sendToolbarMessage( nMsg, p1, p2 ) RETURN WVG_SendToolbarMessage( ::pWnd, nMsg, p1, p2 ) -/*-*/ +// METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nStyle, cKey, nMapRGB ) LOCAL oBtn, pBitmap, cType, nBtn @@ -357,55 +357,55 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS RETURN oBtn -/*-*/ +// METHOD WvgToolBar:delItem() RETURN Self -/*-*/ +// METHOD WvgToolBar:getItem() RETURN Self -/*-*/ +// METHOD WvgToolBar:clear() RETURN Self -/*-*/ +// METHOD WvgToolBar:customize() RETURN Self -/*-*/ +// METHOD WvgToolBar:loadImageSet() RETURN Self -/*-*/ +// METHOD WvgToolBar:saveToolbar() RETURN Self -/*-*/ +// METHOD WvgToolBar:restToolbar() RETURN Self -/*-*/ +// METHOD WvgToolBar:setPosAndSize() RETURN Self -/*-*/ +// METHOD WvgToolBar:setSize() @@ -413,7 +413,7 @@ METHOD WvgToolBar:setSize() RETURN Self -/*-*/ +// METHOD WvgToolBar:buttonClick( xParam ) @@ -423,7 +423,7 @@ METHOD WvgToolBar:buttonClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgToolBar:change( xParam ) @@ -433,7 +433,7 @@ METHOD WvgToolBar:change( xParam ) RETURN Self -/*-*/ +// METHOD WvgToolBar:buttonMenuClick( xParam ) @@ -443,7 +443,7 @@ METHOD WvgToolBar:buttonMenuClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgToolBar:buttonDropDown( xParam ) @@ -453,15 +453,15 @@ METHOD WvgToolBar:buttonDropDown( xParam ) RETURN Self -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * WvgToolbarButton() Class compatible with XbpToolbarButton() */ -/*-*/ -/*-*/ -/*-*/ +// +// +// CLASS WvgToolBarButton @@ -489,7 +489,7 @@ CLASS WvgToolBarButton ENDCLASS -/*-*/ +// METHOD WvgToolBarButton:new( cCaption, nStyle, cKey ) diff --git a/harbour/contrib/gtwvg/treeview.prg b/harbour/contrib/gtwvg/treeview.prg index d2d86f90f9..846dd50873 100644 --- a/harbour/contrib/gtwvg/treeview.prg +++ b/harbour/contrib/gtwvg/treeview.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 26Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef @@ -122,7 +122,7 @@ CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef ENDCLASS -/*-*/ +// METHOD WvgTreeView:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -136,7 +136,7 @@ METHOD WvgTreeView:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgTreeView:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -171,7 +171,7 @@ METHOD WvgTreeView:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgTreeView:handleEvent( nMessage, aNM ) LOCAL aHdr @@ -271,13 +271,13 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -/*-*/ +// METHOD WvgTreeView:destroy() ::wvgWindow:destroy() RETURN NIL -/*-*/ +// METHOD WvgTreeView:getSelectionInfo( nlParam ) LOCAL hItemSelected, hParentOfSelected @@ -292,25 +292,25 @@ METHOD WvgTreeView:getSelectionInfo( nlParam ) ::textParentSelected := trim( cParent ) ::textItemSelected := trim( cText ) - IF ( n := ascan( ::aItems, {|o| o:hItem == hItemSelected } ) ) > 0 + IF ( n := ascan( ::aItems, {| o | o:hItem == hItemSelected } ) ) > 0 ::oItemSelected := ::aItems[ n ] ENDIF RETURN Self -/*-*/ +// METHOD WvgTreeView:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgTreeView:itemFromPos( aPos ) HB_SYMBOL_UNUSED( aPos ) RETURN Self -/*-*/ +// METHOD WvgTreeView:itemCollapsed( xParam ) @@ -320,7 +320,7 @@ METHOD WvgTreeView:itemCollapsed( xParam ) RETURN Self -/*-*/ +// METHOD WvgTreeView:itemExpanded( xParam ) @@ -330,7 +330,7 @@ METHOD WvgTreeView:itemExpanded( xParam ) RETURN Self -/*-*/ +// METHOD WvgTreeView:itemMarked( xParam ) @@ -340,7 +340,7 @@ METHOD WvgTreeView:itemMarked( xParam ) RETURN Self -/*-*/ +// #if 0 METHOD WvgTreeView:itemSelected( xParam ) @@ -350,9 +350,9 @@ METHOD WvgTreeView:itemSelected( xParam ) RETURN Self #endif -/*-*/ +// /* Class WvgTreeViewItem */ -/*-*/ +// CLASS WvgTreeViewItem DATA caption INIT "" @@ -389,37 +389,37 @@ CLASS WvgTreeViewItem METHOD insItem() ENDCLASS -/*-*/ +// METHOD new() CLASS WvgTreeViewItem RETURN Self -/*-*/ +// METHOD create() CLASS WvgTreeViewItem RETURN Self -/*-*/ +// METHOD configure() CLASS WvgTreeViewItem RETURN Self -/*-*/ +// METHOD destroy() CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD isExpanded() CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD setCaption( cCaption ) CLASS WvgTreeViewItem @@ -427,14 +427,14 @@ METHOD setCaption( cCaption ) CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD setExpandedImage( nResIdoBitmap ) CLASS WvgTreeViewItem HB_SYMBOL_UNUSED( nResIdoBitmap ) RETURN NIL -/*-*/ +// METHOD setImage( nResIdoBitmap ) CLASS WvgTreeViewItem @@ -442,7 +442,7 @@ METHOD setImage( nResIdoBitmap ) CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD setMarkedImage( nResIdoBitmap ) CLASS WvgTreeViewItem @@ -450,7 +450,7 @@ METHOD setMarkedImage( nResIdoBitmap ) CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD addItem( cCaption ) CLASS WvgTreeViewItem Local oItem, hParent @@ -470,25 +470,25 @@ METHOD addItem( cCaption ) CLASS WvgTreeViewItem RETURN oItem -/*-*/ +// METHOD delItem() CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD getChildItems() CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD getParentItem() CLASS WvgTreeViewItem RETURN NIL -/*-*/ +// METHOD insItem() CLASS WvgTreeViewItem diff --git a/harbour/contrib/gtwvg/wnd.prg b/harbour/contrib/gtwvg/wnd.prg index 405af8d606..df001357e5 100644 --- a/harbour/contrib/gtwvg/wnd.prg +++ b/harbour/contrib/gtwvg/wnd.prg @@ -49,9 +49,9 @@ * If you do not wish that, delete this exception notice. * */ -/*-*/ -/*-*/ -/*-*/ +// +// +// /* * EkOnkar * ( The LORD is ONE ) @@ -61,9 +61,9 @@ * Pritpal Bedi * 08Nov2008 */ -/*-*/ -/*-*/ -/*-*/ +// +// +// #include "hbclass.ch" #include "common.ch" @@ -74,7 +74,7 @@ #include "wvtwin.ch" #include "wvgparts.ch" -/*-*/ +// * To Switch Over from ASCALLBACK() to SET/GET_Prop() calls * #if 0 @@ -83,7 +83,7 @@ #define __BYSETPROP__ #endif -/*-*/ +// CLASS WvgWindow INHERIT WvgPartHandler @@ -271,7 +271,7 @@ PROTECTED: ENDCLASS -/*-*/ +// METHOD WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -293,7 +293,7 @@ METHOD WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -321,7 +321,7 @@ METHOD WvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -/*-*/ +// METHOD WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -334,7 +334,7 @@ METHOD WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgWindow:destroy() @@ -343,7 +343,7 @@ METHOD WvgWindow:destroy() ENDIF IF Len( ::aChildren ) > 0 - aeval( ::aChildren, {|o| o:destroy() } ) + aeval( ::aChildren, {| o | o:destroy() } ) ::aChildren := {} ENDIF @@ -424,18 +424,18 @@ METHOD WvgWindow:destroy() RETURN NIL -/*-*/ +// METHOD WvgWindow:SetWindowProcCallback() - ::nOldProc := WVG_SetWindowProcBlock( ::pWnd, {|h,m,w,l| ::ControlWndProc( h,m,w,l ) } ) + ::nOldProc := WVG_SetWindowProcBlock( ::pWnd, {| h, m, w, l | ::ControlWndProc( h, m, w, l ) } ) RETURN Self -/*-*/ +// METHOD WvgWindow:captureMouse() RETURN Self -/*-*/ +// METHOD WvgWindow:disable() @@ -446,7 +446,7 @@ METHOD WvgWindow:disable() RETURN .f. -/*-*/ +// METHOD WvgWindow:enable() @@ -457,7 +457,7 @@ METHOD WvgWindow:enable() RETURN .f. -/*-*/ +// METHOD WvgWindow:hide() @@ -468,25 +468,25 @@ METHOD WvgWindow:hide() RETURN Self -/*-*/ +// METHOD WvgWindow:invalidateRect( aRect ) RETURN WVG_InvalidateRect( ::hWnd, aRect ) -/*-*/ +// METHOD WvgWindow:lockPS() RETURN Self -/*-*/ +// METHOD WvgWindow:lockUpdate() RETURN Self -/*-*/ +// METHOD WvgWindow:setColorBG( nRGB ) LOCAL hBrush @@ -508,25 +508,25 @@ METHOD WvgWindow:setColorBG( nRGB ) RETURN Self -/*-*/ +// METHOD WvgWindow:setModalState() RETURN Self -/*-*/ +// METHOD WvgWindow:setPointer() RETURN Self -/*-*/ +// METHOD WvgWindow:setTrackPointer() RETURN Self -/*-*/ +// METHOD WvgWindow:setPos( aPos, lPaint ) LOCAL aPosSz @@ -550,14 +550,14 @@ METHOD WvgWindow:setPos( aPos, lPaint ) RETURN Self -/*-*/ +// /* This will always be called from HB_GTE_RESIZED message of WVG engine */ METHOD WvgWindow:rePosition() RETURN ::setPosAndSize( ::aPos, ::aSize ) -/*-*/ +// METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) LOCAL aPosSz @@ -583,7 +583,7 @@ METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) RETURN Self -/*-*/ +// METHOD WvgWindow:setSize( aSize, lPaint ) LOCAL aPosSz @@ -605,7 +605,7 @@ METHOD WvgWindow:setSize( aSize, lPaint ) ENDIF RETURN Self -/*-*/ +// METHOD WvgWindow:isDerivedFrom( cClassORoObject ) LOCAL lTrue := .f. @@ -626,7 +626,7 @@ METHOD WvgWindow:isDerivedFrom( cClassORoObject ) RETURN lTrue -/*-*/ +// METHOD WvgWindow:show() @@ -636,38 +636,38 @@ METHOD WvgWindow:show() RETURN Self -/*-*/ +// METHOD WvgWindow:toBack() RETURN WVG_SetWindowPosToBack( ::hWnd ) -/*-*/ +// METHOD WvgWindow:toFront() /*RETURN WVG_SetForeGroundWindow( ::hWnd ) */ RETURN WVG_SetWindowPosToTop( ::hWnd ) -/*-*/ +// METHOD WvgWindow:unlockPS() RETURN Self -/*-*/ +// METHOD WvgWindow:winDevice() RETURN Self -/*-*/ +// METHOD WvgWindow:setFont() RETURN Self -/*-*/ +// METHOD WvgWindow:setFontCompoundName( xFont ) LOCAL cOldFont, s, n, nPoint, cFont, cAttr, cFace @@ -681,7 +681,7 @@ METHOD WvgWindow:setFontCompoundName( xFont ) IF !empty( xFont ) cFont := xFont s := lower( cFont ) - n := ascan( aAttr, {|e| at( e, cFont ) > 0 } ) + n := ascan( aAttr, {| e | at( e, cFont ) > 0 } ) IF n > 0 cAttr := aAttr[ n ] n := at( cAttr, s ) @@ -707,20 +707,20 @@ METHOD WvgWindow:setFontCompoundName( xFont ) RETURN cOldFont -/*-*/ +// METHOD WvgWindow:setPresParam() RETURN Self -/*-*/ +// METHOD WvgWindow:currentPos() LOCAL aRect := WVG_GetWindowRect( ::hWnd ) RETURN { aRect[ 1 ], aRect[ 2 ] } -/*-*/ +// METHOD WvgWindow:currentSize() LOCAL aRect @@ -729,27 +729,27 @@ METHOD WvgWindow:currentSize() RETURN { aRect[ 3 ] - aRect[ 1 ], aRect[ 4 ] - aRect[ 2 ] } -/*-*/ +// METHOD WvgWindow:getHWND() RETURN ::hWnd -/*-*/ +// METHOD WvgWindow:getModalState() RETURN Self -/*-*/ +// METHOD WvgWindow:hasInputFocus() RETURN Self -/*-*/ +// * Callback Methods -/*-*/ +// METHOD WvgWindow:enter( xParam ) @@ -765,7 +765,7 @@ METHOD WvgWindow:enter( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:leave( xParam ) @@ -781,7 +781,7 @@ METHOD WvgWindow:leave( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:lbClick( xParam ) @@ -797,7 +797,7 @@ METHOD WvgWindow:lbClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:lbDblClick( xParam ) @@ -813,7 +813,7 @@ METHOD WvgWindow:lbDblClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:lbDown( xParam ) @@ -829,7 +829,7 @@ METHOD WvgWindow:lbDown( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:lbUp( xParam ) @@ -845,7 +845,7 @@ METHOD WvgWindow:lbUp( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:mbClick( xParam ) @@ -861,7 +861,7 @@ METHOD WvgWindow:mbClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:mbDblClick( xParam ) @@ -877,7 +877,7 @@ METHOD WvgWindow:mbDblClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:mbDown( xParam ) @@ -893,7 +893,7 @@ METHOD WvgWindow:mbDown( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:mbUp( xParam ) @@ -909,7 +909,7 @@ METHOD WvgWindow:mbUp( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:motion( xParam ) @@ -925,7 +925,7 @@ METHOD WvgWindow:motion( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:rbClick( xParam ) @@ -941,7 +941,7 @@ METHOD WvgWindow:rbClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:rbDblClick( xParam ) @@ -957,7 +957,7 @@ METHOD WvgWindow:rbDblClick( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:rbDown( xParam ) @@ -973,7 +973,7 @@ METHOD WvgWindow:rbDown( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:rbUp( xParam ) @@ -989,7 +989,7 @@ METHOD WvgWindow:rbUp( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:wheel( xParam ) @@ -1005,9 +1005,9 @@ METHOD WvgWindow:wheel( xParam ) RETURN Self -/*-*/ +// * Other Messages -/*-*/ +// METHOD WvgWindow:close( xParam ) if ::objType == objTypeCrt @@ -1023,7 +1023,7 @@ METHOD WvgWindow:close( xParam ) endif RETURN Self -/*-*/ +// METHOD WvgWindow:helpRequest( xParam ) @@ -1039,7 +1039,7 @@ METHOD WvgWindow:helpRequest( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:keyboard( xParam ) @@ -1055,7 +1055,7 @@ METHOD WvgWindow:keyboard( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:killDisplayFocus( xParam ) if ::objType == objTypeCrt @@ -1071,7 +1071,7 @@ METHOD WvgWindow:killDisplayFocus( xParam ) endif RETURN Self -/*-*/ +// METHOD WvgWindow:killInputFocus( xParam ) @@ -1087,7 +1087,7 @@ METHOD WvgWindow:killInputFocus( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:move( xParam ) @@ -1103,7 +1103,7 @@ METHOD WvgWindow:move( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:paint( xParam ) @@ -1119,7 +1119,7 @@ METHOD WvgWindow:paint( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:quit( xParam, xParam1 ) @@ -1135,7 +1135,7 @@ METHOD WvgWindow:quit( xParam, xParam1 ) RETURN Self -/*-*/ +// METHOD WvgWindow:resize( xParam, xParam1 ) @@ -1151,7 +1151,7 @@ METHOD WvgWindow:resize( xParam, xParam1 ) RETURN Self -/*-*/ +// METHOD WvgWindow:setDisplayFocus( xParam ) @@ -1168,7 +1168,7 @@ METHOD WvgWindow:setDisplayFocus( xParam ) endif RETURN Self -/*-*/ +// METHOD WvgWindow:setInputFocus( xParam ) @@ -1184,7 +1184,7 @@ METHOD WvgWindow:setInputFocus( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:dragEnter( xParam, xParam1 ) @@ -1200,7 +1200,7 @@ METHOD WvgWindow:dragEnter( xParam, xParam1 ) RETURN Self -/*-*/ +// METHOD WvgWindow:dragMotion( xParam ) @@ -1216,7 +1216,7 @@ METHOD WvgWindow:dragMotion( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:dragLeave( xParam ) @@ -1232,7 +1232,7 @@ METHOD WvgWindow:dragLeave( xParam ) RETURN Self -/*-*/ +// METHOD WvgWindow:dragDrop( xParam, xParam1 ) @@ -1248,7 +1248,7 @@ METHOD WvgWindow:dragDrop( xParam, xParam1 ) RETURN Self -/*-*/ +// METHOD WvgWindow:Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -1268,31 +1268,31 @@ METHOD WvgWindow:Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -/*-*/ +// METHOD WvgWindow:setFocus() WVG_SetFocus( ::hWnd ) RETURN Self -/*-*/ +// METHOD WvgWindow:sendMessage( nMessage, nlParam, nwParam ) RETURN WVG_SendMessage( ::hWnd, nMessage, nlParam, nwParam ) -/*-*/ +// METHOD WvgWindow:findObjectByHandle( hWnd ) LOCAL nObj IF len( ::aChildren ) > 0 - IF ( nObj := ascan( ::aChildren, {|o| o:hWnd == hWnd } ) ) > 0 + IF ( nObj := ascan( ::aChildren, {| o | o:hWnd == hWnd } ) ) > 0 RETURN ::aChildren[ nObj ] ENDIF ENDIF RETURN NIL -/*-*/ +// METHOD WvgWindow:getPosAndSize( aPs, aSz ) LOCAL nX, nY, nW, nH, aXY @@ -1345,7 +1345,7 @@ METHOD WvgWindow:getPosAndSize( aPs, aSz ) RETURN { aPos[ 1 ], aPos[ 2 ], aSize[ 1 ], aSize[ 2 ] } -/*-*/ +// METHOD WvgWindow:toolTipText( cText ) @@ -1358,7 +1358,7 @@ METHOD WvgWindow:toolTipText( cText ) RETURN ::s_toolTipText -/*-*/ +// METHOD WvgWindow:createControl() LOCAL hWnd, aPosSz @@ -1386,4 +1386,4 @@ METHOD WvgWindow:createControl() RETURN Self -/*-*/ +// diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index 8320ac520b..2821233dfe 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -180,8 +180,6 @@ IPicture * hb_wvt_gtLoadPictureFromResource( LPCTSTR resource, LPCTSTR section ) return ( IPicture * ) iPicture; } -/*--------------------------------------------------------------------*/ - IPicture * hb_wvt_gtLoadPicture( LPCTSTR image ) { IStream * iStream; diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/harbour/contrib/gtwvg/wvgcuig.c index 073dc283cb..0c42225085 100644 --- a/harbour/contrib/gtwvg/wvgcuig.c +++ b/harbour/contrib/gtwvg/wvgcuig.c @@ -544,7 +544,7 @@ HB_FUNC( WVG_BOXGROUPRAISED ) gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; } -/*-------------------------------------------------------------------*/ + static void hb_wvg_BoxGroupRaised( PHB_GTWVT pWVT, int iLeft, int iTop, int iRight, int iBottom ) { HDC hdc = pWVT->hdc; diff --git a/harbour/contrib/gtwvg/wvtwin.ch b/harbour/contrib/gtwvg/wvtwin.ch index f9bd984944..9c752fe3f5 100644 --- a/harbour/contrib/gtwvg/wvtwin.ch +++ b/harbour/contrib/gtwvg/wvtwin.ch @@ -1222,7 +1222,6 @@ #define DWL_DLGPROC 4 #define DWL_USER 8 -//--------------------------------------------------------------------// /* * Virtual Key Codes */ diff --git a/harbour/contrib/hbct/getinfo.prg b/harbour/contrib/hbct/getinfo.prg index e414730103..56b3465f05 100644 --- a/harbour/contrib/hbct/getinfo.prg +++ b/harbour/contrib/hbct/getinfo.prg @@ -68,7 +68,7 @@ FUNCTION COUNTGETS() FUNCTION CURRENTGET() LOCAL oActive := GetActive() - RETURN ASCAN( GetList, {|oGet| oGet == oActive } ) + RETURN ASCAN( GetList, {| oGet | oGet == oActive } ) FUNCTION GETFLDROW( nField ) LOCAL oGet diff --git a/harbour/contrib/hbhttpd/readme.txt b/harbour/contrib/hbhttpd/readme.txt index 8c0fee13e0..5c13e7f878 100644 --- a/harbour/contrib/hbhttpd/readme.txt +++ b/harbour/contrib/hbhttpd/readme.txt @@ -164,8 +164,8 @@ error is returned. NOTE 2: if you want to use a slash-less URL address as a synonym for the folder you may need an extra redirection rule. Ex., - "/files" => {{|| URedirect("/files/")}, .F.} - "/files/*" => {{|x| UProcFiles(DocumentRoot + x)}, .F.} + "/files" => { {|| URedirect( "/files/" ) }, .F. } + "/files/*" => { {| x | UProcFiles(DocumentRoot + x ) }, .F. } Widgets @@ -185,7 +185,7 @@ to use some objects (browse, etc.) instead of plain: To use UWigets under some URL subtree, you should add an entry to server mounting table specifying standard widgets handler: - "app/*" => {{|x| UProcWidgets(x, s_aMap)}, .T.} + "app/*" => { {| x | UProcWidgets( x, s_aMap ) }, .T. } You can see UWidgets handler requires requests to be sessioned. s_aMap is one more table similar to server mounting table. Actually, @@ -198,7 +198,7 @@ containing the mapping of URL subtree into handler functions. Ex., "account" => @proc_account(), ; "items" => @proc_items(), ; "items/edit" => @proc_items_edit(), ; - "logout" => @proc_logout()} + "logout" => @proc_logout() } Page handler functions receives a parameter indicating received event/method. Handler has a structure: @@ -222,7 +222,7 @@ As you can see this handler reminds the structure of traditional GUI based application message/event handler, for example in windows, we have: -STATIC FUNC WndProc(hWnd, uMsg, wParam, lParam) +STATIC FUNC WndProc( hWnd, uMsg, wParam, lParam ) IF uMsg == WM_CREATE ELSEIF uMsg == WM_PAINT ELSEIF uMsg == WM_DESTROY @@ -240,7 +240,7 @@ creates a main widget of web page. This main widget acts as a layout/container in for example, GTK+ library. It has :Add() method and other widgets can be included inside of it. Ex., oM := UWMainNew() - oM:Add( UWLabelNew("Hello, Widgets World!") ) + oM:Add( UWLabelNew( "Hello, Widgets World!" ) ) UWidgets keeps main widget (and its children) inside session variable and produces html output for it upon GET (or POST) requests. Main @@ -286,7 +286,7 @@ items dialog, and items_edit_handler() function for item_edit dialog. dialog := create_new_modal_dialog() // create items_edit dialog dialog:handler := @items_edit_handler() process_event_loop() // until dialog is closed - destroy_dialog(dialog) + destroy_dialog( dialog ) ENDIF ... RETURN diff --git a/harbour/contrib/hbhttpd/widgets.prg b/harbour/contrib/hbhttpd/widgets.prg index e374b31450..6ed3d0b48d 100644 --- a/harbour/contrib/hbhttpd/widgets.prg +++ b/harbour/contrib/hbhttpd/widgets.prg @@ -33,7 +33,7 @@ METHOD Paint() CLASS UWMain UWrite( '' ) UWrite( '' ) UWrite( '' ) - AEval( Self:aChilds, {|x| X:Paint() } ) + AEval( Self:aChilds, {| x | x:Paint() } ) UWrite( '' ) RETURN Self @@ -70,7 +70,7 @@ METHOD Paint() CLASS UWLayoutGrid UWrite( '' ) FOR EACH aCell IN aRow UWrite( '' ) - AEval( aCell, {|o| o:Paint() } ) + AEval( aCell, {| o | o:Paint() } ) UWrite( '' ) NEXT UWrite( '' ) @@ -85,16 +85,16 @@ METHOD Add( oWidget, nRow, nCol ) CLASS UWLayoutGrid IF nRow > Len( Self:aChilds ) FOR nI := Len( Self:aChilds ) + 1 TO nRow - aI := Array( Len( Self:aChilds[1] ) ) - FOR nJ := 1 TO Len( Self:aChilds[1] ) - aI[nJ] := {} + aI := Array( Len( Self:aChilds[ 1 ] ) ) + FOR nJ := 1 TO Len( Self:aChilds[ 1 ] ) + aI[ nJ ] := {} NEXT AAdd( Self:aChilds, aI ) NEXT ENDIF - IF nCol > Len( Self:aChilds[1] ) - FOR nI := Len( Self:aChilds[1] ) + 1 TO nCol - AEval( Self:aChilds, {|x| AAdd( x, {} ) } ) + IF nCol > Len( Self:aChilds[ 1 ] ) + FOR nI := Len( Self:aChilds[ 1 ] ) + 1 TO nCol + AEval( Self:aChilds, {| x | AAdd( x, {} ) } ) NEXT ENDIF AAdd( Self:aChilds[nRow, nCol], oWidget ) @@ -185,7 +185,7 @@ METHOD Add( oWidget ) CLASS UWForm METHOD Paint() CLASS UWForm UWrite( '
' ) - AEval( Self:aChilds, {|x| X:Paint() } ) + AEval( Self:aChilds, {| x | x:Paint() } ) UWrite( '
' ) RETURN Self @@ -363,20 +363,20 @@ METHOD Output() CLASS UWBrowse cRet += '' - // Header +// Header cRet += '' FOR nI := 1 TO Len( Self:aColumns ) cRet += '' NEXT cRet += '' - // Body +// Body nPos := 0 - DBGOTOP() + dbGoTop() IF Self:nPageSize > 0 .AND. Self:nPos > 0 dbSkip( Self:nPos ) ENDIF - DO WHILE ! Eof() + DO WHILE ! EOF() cRet += '' FOR nI := 1 TO Len( Self:aColumns ) xField := Self:aColumns[nI, 3] @@ -397,12 +397,12 @@ METHOD Output() CLASS UWBrowse NEXT cRet += '' dbSkip() - IF ++ nPos >= Self:nPageSize + IF ++nPos >= Self:nPageSize EXIT ENDIF ENDDO cRet += '
' + UHtmlEncode( Self:aColumns[nI, 2] ) + '
' - IF ! Eof() .OR. Self:nPos > 0 + IF ! EOF() .OR. Self:nPos > 0 cUrl := server["REQUEST_URI"] IF ( nI := At( "?_ucs=", cUrl ) ) == 0 nI := At( "&_ucs=", cUrl ) @@ -418,7 +418,7 @@ METHOD Output() CLASS UWBrowse ENDIF cUrl += iif( "?" $ cUrl, "&", "?" ) + "_pos=" cRet := '
' + cRet - IF ! Eof() + IF ! EOF() cI := cUrl + hb_ntos( Self:nPos + Self:nPageSize ) cRet := '>>' + cRet ENDIF @@ -458,7 +458,7 @@ METHOD Output() CLASS UWOption LOCAL cRet := "" - AEval( Self:aOption, {| X | cRet += HB_STRFORMAT( '', UHtmlEncode(X[2] ), iif(X[2] == Self:cValue, " selected", "" ), X[1] ) } ) + AEval( Self:aOption, {| X | cRet += hb_StrFormat( '', UHtmlEncode( X[ 2 ] ), iif( X[ 2 ] == Self:cValue, " selected", "" ), X[ 1 ] ) } ) RETURN cRet @@ -472,8 +472,8 @@ PROCEDURE UProcWidgets( cURL, aMap ) LOCAL aStack, aURL, aFrame, cI, nI, nL, lRet - IF HB_HHasKey( aMap, cURL ) - // aStack[i] = {url_part, function, variables} + IF hb_HHasKey( aMap, cURL ) + // aStack[ i ] = { url_part, function, variables } IF ( aStack := hb_HGetDef( session, "_ustack" ) ) == NIL session[ "_ustack" ] := aStack := {} ENDIF @@ -482,8 +482,8 @@ PROCEDURE UProcWidgets( cURL, aMap ) nI := 1 nL := Min( Len( aURL ), Len( aStack ) ) DO WHILE nI <= nL - IF aStack[nI, 1] == aURL[nI] - nI ++ + IF aStack[ nI, 1 ] == aURL[ nI ] + nI++ ELSE EXIT ENDIF @@ -491,10 +491,10 @@ PROCEDURE UProcWidgets( cURL, aMap ) // Exit procedures DO WHILE nI <= Len( aStack ) - aFrame := ATAIL( aStack ) - IF aFrame[2] != NIL - session[ "_uthis" ] := aFrame[3] - Eval( aFrame[2], "EXIT" ) + aFrame := ATail( aStack ) + IF aFrame[ 2 ] != NIL + session[ "_uthis" ] := aFrame[ 3 ] + Eval( aFrame[ 2 ], "EXIT" ) session[ "_uthis" ] := NIL ENDIF ASize( aStack, Len( aStack ) - 1 ) @@ -505,7 +505,7 @@ PROCEDURE UProcWidgets( cURL, aMap ) // Enter procedures DO WHILE nI <= Len( aURL ) cI := uhttpd_join( "/", ASize( AClone(aURL ), nI ) ) - IF HB_HHasKey( aMap, cI ) + IF hb_HHasKey( aMap, cI ) session[ "_uthis" ] := { "idhash" => { => } } IF ( lRet := Eval( aMap[cI], "INIT" ) ) == .T. AAdd( aStack, { aURL[nI], aMap[cI], session[ "_uthis" ] } ) @@ -517,17 +517,17 @@ PROCEDURE UProcWidgets( cURL, aMap ) ELSE AAdd( aStack, { aURL[nI], NIL, NIL } ) ENDIF - nI ++ + nI++ ENDDO IF lRet - session[ "_uthis" ] := ATAIL( aStack )[3] + session[ "_uthis" ] := ATail( aStack )[ 3 ] IF server[ "REQUEST_METHOD" ] == "GET" - Eval( ATAIL( aStack )[2], "GET" ) + Eval( ATail( aStack )[ 2 ], "GET" ) ELSEIF server[ "REQUEST_METHOD" ] == "POST" - Eval( ATAIL( aStack )[2], "POST" ) + Eval( ATail( aStack )[ 2 ], "POST" ) ENDIF - ATAIL( aStack )[3] := session[ "_uthis" ] + ATail( aStack )[ 3 ] := session[ "_uthis" ] session[ "_uthis" ] := NIL ENDIF ELSE @@ -563,6 +563,7 @@ STATIC PROCEDURE SetWId( oW, cID ) RETURN FUNCTION UGetWidgetById( cID ) + RETURN hb_HGetDef( session[ "_uthis", "idhash" ], cID ) STATIC FUNCTION uhttpd_split( cSeparator, cString ) diff --git a/harbour/contrib/hbmzip/tests/myunzip.prg b/harbour/contrib/hbmzip/tests/myunzip.prg index 48dd107c33..c3cc5b0642 100644 --- a/harbour/contrib/hbmzip/tests/myunzip.prg +++ b/harbour/contrib/hbmzip/tests/myunzip.prg @@ -51,56 +51,57 @@ */ PROCEDURE Main( ... ) + LOCAL hUnzip, aWild, cFileName, cExt, cPath, cFile, ; - dDate, cTime, nSize, nCompSize, nErr, ; - lCrypted, cPassword, cComment, tmp + dDate, cTime, nSize, nCompSize, nErr, ; + lCrypted, cPassword, cComment, tmp aWild := { ... } - IF LEN( aWild ) < 1 + IF Len( aWild ) < 1 ? "Usage: myunzip [ --pass ] [ ... ]" RETURN ENDIF - HB_FNameSplit( aWild[ 1 ], @cPath, @cFileName, @cExt ) - IF EMPTY( cExt ) + hb_FNameSplit( aWild[ 1 ], @cPath, @cFileName, @cExt ) + IF Empty( cExt ) cExt := ".zip" ENDIF - cFileName := HB_FNameMerge( cPath, cFileName, cExt ) + cFileName := hb_FNameMerge( cPath, cFileName, cExt ) - ADEL( aWild, 1 ) - ASIZE( aWild, LEN( aWild ) - 1 ) + ADel( aWild, 1 ) + ASize( aWild, Len( aWild ) - 1 ) - FOR tmp := 1 TO LEN( aWild ) - 1 - IF LOWER( aWild[ tmp ] ) == "--pass" + FOR tmp := 1 TO Len( aWild ) - 1 + IF Lower( aWild[ tmp ] ) == "--pass" cPassword := aWild[ tmp + 1 ] aWild[ tmp ] := "" aWild[ tmp + 1 ] := "" ENDIF NEXT - AEVAL( aWild, {|cPattern, nPos| aWild[ nPos ] := STRTRAN( cPattern, "\", "/" ) } ) + AEval( aWild, {| cPattern, nPos | aWild[ nPos ] := StrTran( cPattern, "\", "/" ) } ) hUnzip := HB_UNZIPOPEN( cFileName ) - IF ! EMPTY( hUnzip ) + IF ! Empty( hUnzip ) ? "Archive file:", cFileName HB_UnzipGlobalInfo( hUnzip, @nSize, @cComment ) ? "Number of entires:", nSize - IF !EMPTY( cComment ) - ? "global comment:", cComment + IF !Empty( cComment ) + ? "global comment:", cComment ENDIF ? "" ? "Filename Date Time Size Compressed Action" ? "---------------------------------------------------------------------------------" nErr := HB_UNZIPFILEFIRST( hUnzip ) DO WHILE nErr == 0 - HB_UnzipFileInfo( hUnzip, @cFile, @dDate, @cTime,,,, @nSize, @nCompSize, @lCrypted, @cComment ) - ? PADR( cFile + iif( lCrypted, "*", ""), 30 ), DTOC( dDate ), cTime, nSize, nCompSize - IF !empty( cComment ) + HB_UnzipFileInfo( hUnzip, @cFile, @dDate, @cTime, , , , @nSize, @nCompSize, @lCrypted, @cComment ) + ? PadR( cFile + iif( lCrypted, "*", "" ), 30 ), DToC( dDate ), cTime, nSize, nCompSize + IF !Empty( cComment ) ? "comment:", cComment ENDIF - IF ASCAN( aWild, {|cPattern| HB_WILDMATCH( cPattern, cFile, .T. ) } ) > 0 + IF AScan( aWild, {| cPattern | hb_WildMatch( cPattern, cFile, .T. ) } ) > 0 ?? " Extracting" HB_UnzipExtractCurrentFile( hUnzip, NIL, cPassword ) ELSE diff --git a/harbour/contrib/hbmzip/tests/myzip.prg b/harbour/contrib/hbmzip/tests/myzip.prg index 028ec0b426..ccedaf7e7a 100644 --- a/harbour/contrib/hbmzip/tests/myzip.prg +++ b/harbour/contrib/hbmzip/tests/myzip.prg @@ -51,33 +51,34 @@ */ PROCEDURE Main( ... ) + LOCAL hZip, aDir, aFile, aWild, ; - cZipName, cPath, cFileName, cExt, cWild, cPassword, cComment,; - tmp + cZipName, cPath, cFileName, cExt, cWild, cPassword, cComment, ; + tmp aWild := { ... } - IF LEN(aWild) < 2 + IF Len( aWild ) < 2 ? "Usage: myzip [ --pass ] [ --comment ] [ ... ]" RETURN ENDIF - HB_FNameSplit( aWild[ 1 ], @cPath, @cFileName, @cExt ) - IF EMPTY( cExt ) + hb_FNameSplit( aWild[ 1 ], @cPath, @cFileName, @cExt ) + IF Empty( cExt ) cExt := ".zip" ENDIF - cZipName := HB_FNameMerge( cPath, cFileName, cExt ) + cZipName := hb_FNameMerge( cPath, cFileName, cExt ) - HB_ADEL( aWild, 1, .T. ) + hb_ADel( aWild, 1, .T. ) - FOR tmp := LEN( aWild ) - 1 TO 1 STEP -1 - IF LOWER( aWild[ tmp ] ) == "--pass" - IF EMPTY( cPassword ) + FOR tmp := Len( aWild ) - 1 TO 1 STEP -1 + IF Lower( aWild[ tmp ] ) == "--pass" + IF Empty( cPassword ) cPassword := aWild[ tmp + 1 ] ENDIF aWild[ tmp ] := "" aWild[ tmp + 1 ] := "" - ELSEIF LOWER( aWild[ tmp ] ) == "--comment" - IF EMPTY( cComment ) + ELSEIF Lower( aWild[ tmp ] ) == "--comment" + IF Empty( cComment ) cComment := aWild[ tmp + 1 ] ENDIF aWild[ tmp ] := "" @@ -86,12 +87,12 @@ PROCEDURE Main( ... ) NEXT hZip := HB_ZIPOPEN( cZipName ) - IF ! EMPTY( hZip ) + IF ! Empty( hZip ) ? "Archive file:", cZipName FOR EACH cWild IN aWild - IF !EMPTY( cWild ) - HB_FNameSplit( cWild, @cPath, @cFileName, @cExt ) - aDir := HB_DirScan( cPath, cFileName + cExt ) + IF !Empty( cWild ) + hb_FNameSplit( cWild, @cPath, @cFileName, @cExt ) + aDir := hb_DirScan( cPath, cFileName + cExt ) FOR EACH aFile IN aDir IF ! cPath + aFile[ 1 ] == cZipName ? "Adding", cPath + aFile[ 1 ] diff --git a/harbour/contrib/hbnetio/tests/netiot02.prg b/harbour/contrib/hbnetio/tests/netiot02.prg index 86f2f2b627..88659c57f6 100644 --- a/harbour/contrib/hbnetio/tests/netiot02.prg +++ b/harbour/contrib/hbnetio/tests/netiot02.prg @@ -66,9 +66,9 @@ proc main() ? "HB_DATETIME() function is supported:", net:exists:HB_DATETIME ? /* display text on server console */ - net:QOUT( repl( "=", 70 ) ) + net:QOUT( replicate( "=", 70 ) ) net:QOUT( "This is RPC TEST", hb_datetime(), version() ) - net:QOUT( repl( "=", 70 ) ) + net:QOUT( replicate( "=", 70 ) ) /* execute some functions on the server side and display the results */ ? "SERVER DATE:", net:DATE() diff --git a/harbour/contrib/hbnf/hex2dec.prg b/harbour/contrib/hbnf/hex2dec.prg index 390f1e9be8..7833bdb11d 100644 --- a/harbour/contrib/hbnf/hex2dec.prg +++ b/harbour/contrib/hbnf/hex2dec.prg @@ -26,14 +26,12 @@ * */ -#define HEXTABLE "0123456789ABCDEF" - FUNCTION FT_HEX2DEC( cHexNum ) LOCAL n, nDec := 0, nHexPower := 1 FOR n := Len( cHexNum ) TO 1 STEP -1 - nDec += ( At( subs( Upper( cHexNum ), n, 1 ), HEXTABLE ) - 1 ) * nHexPower + nDec += ( At( SubStr( Upper( cHexNum ), n, 1 ), "0123456789ABCDEF" ) - 1 ) * nHexPower nHexPower *= 16 NEXT diff --git a/harbour/contrib/hbsqlit3/tests/backup.prg b/harbour/contrib/hbsqlit3/tests/backup.prg index fcfbfd74eb..0f2e2e10bc 100644 --- a/harbour/contrib/hbsqlit3/tests/backup.prg +++ b/harbour/contrib/hbsqlit3/tests/backup.prg @@ -176,8 +176,8 @@ STATIC FUNCTION cErrorMsg( nError, lShortMsg ) IF nError == 0 cErrorMsg := "SQLITE_OK" ELSE - nIndex := AScan( aErrorCodes, {|x| x[1] == nError } ) - cErrorMsg := iif( nIndex > 0, aErrorCodes[ nIndex ][ iif(lShortMsg,2,3) ], cErrorMsg ) + nIndex := AScan( aErrorCodes, {| x | x[ 1 ] == nError } ) + cErrorMsg := iif( nIndex > 0, aErrorCodes[ nIndex ][ iif( lShortMsg, 2, 3 ) ], cErrorMsg ) ENDIF ENDIF diff --git a/harbour/contrib/hbwin/tests/pdfcreat.prg b/harbour/contrib/hbwin/tests/pdfcreat.prg index 9673554528..e305a6a858 100644 --- a/harbour/contrib/hbwin/tests/pdfcreat.prg +++ b/harbour/contrib/hbwin/tests/pdfcreat.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code - * Demonstration code for generating .pdf documents using PDFCreator + * Demonstration code for generating .pdf documents using PDFCreator * COM interface. * * You should install PDFCreator to be able to run this test @@ -20,23 +20,24 @@ * */ -PROC main() -LOCAL oPC, nTime, cDefaultPrinter, cFilename, oPrinter, nEvent := 0 +PROCEDURE Main() - IF EMPTY( oPC := WIN_OLECreateObject( "PDFCreator.clsPDFCreator" ) ) + LOCAL oPC, nTime, cDefaultPrinter, cFilename, oPrinter, nEvent := 0 + + IF Empty( oPC := WIN_OLECreateObject( "PDFCreator.clsPDFCreator" ) ) ? "Unable to create PDFCreator COM object" RETURN ENDIF - cFilename := HB_PROGNAME() + cFilename := hb_ProgName() /* Setup event notification */ - oPC:__hSink := __AxRegisterHandler( oPC:__hObj, {|X| nEvent := X} ) + oPC:__hSink := __AxRegisterHandler( oPC:__hObj, {| X | nEvent := X } ) oPC:cStart( "/NoProcessingAtStartup" ) oPC:_cOption( "UseAutosave", 1 ) oPC:_cOption( "UseAutosaveDirectory", 1 ) - oPC:_cOption( "AutosaveDirectory", LEFT( cFileName, RAT( HB_PS(), cFilename ) - 1 ) ) + oPC:_cOption( "AutosaveDirectory", Left( cFileName, RAt( hb_ps(), cFilename ) - 1 ) ) oPC:_cOption( "AutosaveFilename", "pdfcreat.pdf" ) oPC:_cOption( "AutosaveFormat", 0 ) @@ -44,7 +45,7 @@ LOCAL oPC, nTime, cDefaultPrinter, cFilename, oPrinter, nEvent := 0 oPC:cDefaultPrinter := "PDFCreator" oPC:cClearCache() - /* You can do any printing here using WinAPI or + /* You can do any printing here using WinAPI or call a 3rd party application to do printing */ #if 1 oPrinter := Win_Prn():New( "PDFCreator" ) @@ -58,16 +59,16 @@ LOCAL oPC, nTime, cDefaultPrinter, cFilename, oPrinter, nEvent := 0 #else oPrinter := NIL ? "Do some printing to PDFCreator printer and press any key..." - INKEY(0) + Inkey( 0 ) #endif oPC:cPrinterStop := .F. - nTime := hb_milliseconds() - DO WHILE nEvent == 0 .AND. hb_milliseconds() - nTime < 10000 + nTime := hb_milliSeconds() + DO WHILE nEvent == 0 .AND. hb_milliSeconds() - nTime < 10000 hb_idleSleep( 0.5 ) /* The following dummy line is required to allow COM server to send event [Mindaugas] */ - oPC:cOption("UseAutosave") + oPC:cOption( "UseAutosave" ) ENDDO IF nEvent == 0 @@ -83,4 +84,5 @@ LOCAL oPC, nTime, cDefaultPrinter, cFilename, oPrinter, nEvent := 0 oPC:cDefaultPrinter := cDefaultPrinter oPC:cClose() oPC := NIL -RETURN + + RETURN diff --git a/harbour/contrib/hbwin/tests/testole.prg b/harbour/contrib/hbwin/tests/testole.prg index 0d2249d08f..1d214399d3 100644 --- a/harbour/contrib/hbwin/tests/testole.prg +++ b/harbour/contrib/hbwin/tests/testole.prg @@ -17,6 +17,7 @@ */ PROCEDURE Main() + LOCAL nOption DO WHILE .T. @@ -77,8 +78,8 @@ PROCEDURE Main() RETURN - STATIC PROCEDURE Exm_MSExcel() + LOCAL oExcel, oWorkBook, oWorkSheet, oAS LOCAL nI, nCount @@ -102,7 +103,7 @@ STATIC PROCEDURE Exm_MSExcel() // OLE also allows to access collection elements by passing // indices to :Worksheets property FOR nI := 1 TO nCount - ? oWorkBook:WorkSheets(nI):Name + ? oWorkBook:WorkSheets( nI ):Name NEXT oAS := oExcel:ActiveSheet() @@ -131,14 +132,14 @@ STATIC PROCEDURE Exm_MSExcel() oAS:Cells( 5, 2 ):Value := .T. oAS:Cells( 6, 1 ):Value := "Date:" - oAS:Cells( 6, 2 ):Value := DATE() + oAS:Cells( 6, 2 ):Value := Date() oAS:Cells( 7, 1 ):Value := "Timestamp:" - oAS:Cells( 7, 2 ):Value := HB_DATETIME() + oAS:Cells( 7, 2 ):Value := hb_DateTime() // Some formatting oAS:Columns( 1 ):Font:Bold := .T. - oAS:Columns( 2 ):HorizontalAlignment := -4152 // xlRight + oAS:Columns( 2 ):HorizontalAlignment := - 4152 // xlRight oAS:Columns( 1 ):AutoFit() oAS:Columns( 2 ):AutoFit() @@ -154,13 +155,13 @@ STATIC PROCEDURE Exm_MSExcel() oExcel:Quit() ELSE - ? "Error: MS Excel not available. [" + win_oleErrorText()+ "]" + ? "Error: MS Excel not available. [" + win_oleErrorText() + "]" ENDIF RETURN - STATIC PROCEDURE Exm_MSWord() + LOCAL oWord, oText IF ( oWord := win_oleCreateObject( "Word.Application" ) ) != NIL @@ -182,8 +183,8 @@ STATIC PROCEDURE Exm_MSWord() RETURN - STATIC PROCEDURE Exm_MSOutlook() + LOCAL oOL, oList IF ( oOL := win_oleCreateObject( "Outlook.Application" ) ) != NIL @@ -196,8 +197,8 @@ STATIC PROCEDURE Exm_MSOutlook() RETURN - STATIC PROCEDURE Exm_MSOutlook2() + LOCAL oOL, oLista, oMail LOCAL i @@ -206,8 +207,8 @@ STATIC PROCEDURE Exm_MSOutlook2() oMail := oOL:CreateItem( 0 /* olMailItem */ ) FOR i := 1 TO 10 - oMail:Recipients:Add( "Contact" + LTRIM( STR( i, 2 ) ) + ; - "" ) + oMail:Recipients:Add( "Contact" + hb_ntos( i ) + ; + "" ) NEXT oLista := oOL:CreateItem( 7 /* olDistributionListItem */ ) @@ -222,8 +223,8 @@ STATIC PROCEDURE Exm_MSOutlook2() RETURN - STATIC PROCEDURE Exm_IExplorer() + LOCAL oIE IF ( oIE := win_oleCreateObject( "InternetExplorer.Application" ) ) != NIL @@ -235,16 +236,16 @@ STATIC PROCEDURE Exm_IExplorer() RETURN - STATIC PROCEDURE Exm_IExplorer2() + LOCAL oIE IF ( oIE := win_oleCreateObject( "InternetExplorer.Application" ) ) != NIL - oIE:__hSink := __AxRegisterHandler( oIE:__hObj, {|...| QOUT(...)}) + oIE:__hSink := __AxRegisterHandler( oIE:__hObj, {| ... | QOut( ... ) } ) oIE:Visible := .T. oIE:Navigate( "http://harbour-project.org" ) WHILE oIE:ReadyState != 4 - HB_IDLESLEEP( 0 ) + hb_idleSleep( 0 ) ENDDO ELSE ? "Error. IExplorer not available.", win_oleErrorText() @@ -252,15 +253,15 @@ STATIC PROCEDURE Exm_IExplorer2() RETURN - STATIC PROCEDURE Exm_OOCalc() + LOCAL oServiceManager, oDesktop, oDoc, oSheet IF ( oServiceManager := win_oleCreateObject( "com.sun.star.ServiceManager" ) ) != NIL oDesktop := oServiceManager:createInstance( "com.sun.star.frame.Desktop" ) oDoc := oDesktop:loadComponentFromURL( "private:factory/scalc", "_blank", 0, {} ) - oSheet := oDoc:getSheets:getByIndex(0) + oSheet := oDoc:getSheets:getByIndex( 0 ) oSheet:getCellRangeByName( "A1" ):setString( "OLE from Harbour" ) @@ -275,11 +276,11 @@ STATIC PROCEDURE Exm_OOCalc() oSheet:getCellRangeByName( "B5" ):setPropertyValue( "NumberFormat", 99 ) // BOOLEAN oSheet:getCellRangeByName( "A6" ):setString( "Date:" ) - oSheet:getCellRangeByName( "B6" ):setValue( DATE() ) + oSheet:getCellRangeByName( "B6" ):setValue( Date() ) oSheet:getCellRangeByName( "B6" ):setPropertyValue( "NumberFormat", 36 ) // YYYY-MM-DD oSheet:getCellRangeByName( "A7" ):setString( "Timestamp:" ) - oSheet:getCellRangeByName( "B7" ):setValue( HB_DATETIME() ) + oSheet:getCellRangeByName( "B7" ):setValue( hb_DateTime() ) oSheet:getCellRangeByName( "B7" ):setPropertyValue( "NumberFormat", 51 ) // YYYY-MM-DD HH:MM:SS oSheet:getCellRangeByName( "A3" ):setPropertyValue( "IsCellBackgroundTransparent", .F. ) @@ -291,8 +292,8 @@ STATIC PROCEDURE Exm_OOCalc() RETURN - STATIC PROCEDURE Exm_OOWriter() + LOCAL oServiceManager, oDesktop, oDoc, oText, oCursor, oTable, oRow, oCell, oRows IF ( oServiceManager := win_oleCreateObject( "com.sun.star.ServiceManager" ) ) != NIL @@ -302,9 +303,9 @@ STATIC PROCEDURE Exm_OOWriter() oText := oDoc:getText oCursor := oText:createTextCursor - oText:insertString( oCursor, "OpenOffice Writer scripting from Harbour." + CHR(10), .F. ) + oText:insertString( oCursor, "OpenOffice Writer scripting from Harbour." + Chr( 10 ), .F. ) - oText:insertString( oCursor, "This is the second line" + CHR(10), .F. ) + oText:insertString( oCursor, "This is the second line" + Chr( 10 ), .F. ) oTable := oDoc:createInstance( "com.sun.star.text.TextTable" ) oTable:initialize( 2, 4 ) @@ -320,19 +321,19 @@ STATIC PROCEDURE Exm_OOWriter() oRow:setPropertyValue( "BackColor", ( 192 * 256 + 192 ) * 256 + 128 ) oCell := oTable:getCellByName( "A1" ) - oCell:insertString( oCell:createTextCursor, "Jan", .F.) + oCell:insertString( oCell:createTextCursor, "Jan", .F. ) oCell := oTable:getCellByName( "B1" ) - oCell:insertString( oCell:createTextCursor, "Feb", .F.) + oCell:insertString( oCell:createTextCursor, "Feb", .F. ) oCell := oTable:getCellByName( "C1" ) - oCell:insertString( oCell:createTextCursor, "Mar", .F.) + oCell:insertString( oCell:createTextCursor, "Mar", .F. ) // I guess we can set text without cursor creation - oTable:getCellByName( "D1" ):setString("SUM") + oTable:getCellByName( "D1" ):setString( "SUM" ) - oTable:getCellByName( "A2" ):setValue(123.12) - oTable:getCellByName( "B2" ):setValue(97.07) - oTable:getCellByName( "C2" ):setValue(106.38) - oTable:getCellByName( "D2" ):setFormula("sum ") + oTable:getCellByName( "A2" ):setValue( 123.12 ) + oTable:getCellByName( "B2" ):setValue( 97.07 ) + oTable:getCellByName( "C2" ):setValue( 106.38 ) + oTable:getCellByName( "D2" ):setFormula( "sum " ) oText:insertControlCharacter( oCursor, 0 , .F. ) // PARAGRAPH_BREAK @@ -355,7 +356,7 @@ STATIC PROCEDURE Exm_OOOpen() IF ( oOO_ServiceManager := win_oleCreateObject( "com.sun.star.ServiceManager" ) ) != NIL - hb_FNameSplit( hb_ArgV( 0 ), @cDir ) + hb_FNameSplit( hb_argv( 0 ), @cDir ) oOO_Desktop := oOO_ServiceManager:createInstance( "com.sun.star.frame.Desktop" ) oOO_PropVal01 := oOO_ServiceManager:Bridge_GetStruct( "com.sun.star.beans.PropertyValue" ) @@ -398,10 +399,10 @@ STATIC PROCEDURE Exm_CDO() oCDOConf := win_oleCreateObject( "CDO.Configuration" ) - oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/sendusing"):Value := 2 // ; cdoSendUsingPort - oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/smtpserver"):Value := "localhost" - oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/smtpserverport"):Value := 25 - oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/smtpconnectiontimeout"):Value := 120 + oCDOConf:Fields( "http://schemas.microsoft.com/cdo/configuration/sendusing" ):Value := 2 // ; cdoSendUsingPort + oCDOConf:Fields( "http://schemas.microsoft.com/cdo/configuration/smtpserver" ):Value := "localhost" + oCDOConf:Fields( "http://schemas.microsoft.com/cdo/configuration/smtpserverport" ):Value := 25 + oCDOConf:Fields( "http://schemas.microsoft.com/cdo/configuration/smtpconnectiontimeout" ):Value := 120 oCDOConf:Fields:Update() oCDOMsg:Configuration := oCDOConf @@ -411,7 +412,7 @@ STATIC PROCEDURE Exm_CDO() oCDOMsg:Subject := "Test message" oCDOMsg:TextBody := "Test message body" - BEGIN SEQUENCE WITH {|oErr| Break( oErr )} + BEGIN SEQUENCE WITH {| oErr | Break( oErr ) } oCDOMsg:Send() RECOVER ? "Error: CDO send error.", win_oleErrorText() @@ -443,13 +444,13 @@ STATIC PROCEDURE Exm_ADODB() IF ( oRs := win_oleCreateObject( "ADODB.Recordset" ) ) != NIL oRs:Open( "SELECT * FROM test ORDER BY First", ; - "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + hb_DirBase() + "\..\..\hbodbc\tests\test.mdb",; - adOpenForwardOnly,; + "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + hb_DirBase() + "\..\..\hbodbc\tests\test.mdb", ; + adOpenForwardOnly, ; adLockReadOnly ) DO WHILE ! oRs:EOF - ? oRs:Fields( "First" ):Value - oRs:MoveNext() + ? oRs:Fields( "First" ):Value + oRs:MoveNext() ENDDO oRs:Close() @@ -457,8 +458,8 @@ STATIC PROCEDURE Exm_ADODB() RETURN - STATIC PROCEDURE Exm_SOAP() + LOCAL oSoapClient IF ! Empty( oSoapClient := win_oleCreateObject( "MSSOAP.SoapClient30" ) ) @@ -472,8 +473,8 @@ STATIC PROCEDURE Exm_SOAP() RETURN - STATIC PROCEDURE Exm_PocketSOAP() + LOCAL oHttp := win_oleCreateObject( "PocketSOAP.HTTPTransport.2" ) LOCAL oEnvelope := win_oleCreateObject( "PocketSOAP.Envelope.2" ) @@ -492,18 +493,18 @@ STATIC PROCEDURE Exm_PocketSOAP() RETURN - STATIC PROCEDURE Exm_CreateShortcut() + LOCAL oShell, oSC IF ( oShell := win_oleCreateObject( "WScript.Shell" ) ) != NIL - oSC := oShell:CreateShortcut( hb_dirBase() + hb_ps() + "testole.lnk" ) + oSC := oShell:CreateShortcut( hb_DirBase() + hb_ps() + "testole.lnk" ) oSC:TargetPath := hb_ProgName() oSC:WorkingDirectory := hb_DirBase() oSC:IconLocation := hb_ProgName() + ",0" oSC:Save() ELSE - ? "Error: Shell not available. [" + win_oleErrorText()+ "]" + ? "Error: Shell not available. [" + win_oleErrorText() + "]" ENDIF RETURN diff --git a/harbour/contrib/rddsql/tests/arrayrdd.prg b/harbour/contrib/rddsql/tests/arrayrdd.prg index cde377478c..ec820f7ba3 100644 --- a/harbour/contrib/rddsql/tests/arrayrdd.prg +++ b/harbour/contrib/rddsql/tests/arrayrdd.prg @@ -4,23 +4,24 @@ REQUEST SQLMIX -PROC main() - RDDSETDEFAULT("SQLMIX") - DBCREATE("persons", {{"NAME", "C", 20, 0}, {"FAMILYNAME", "C", 20, 0}, {"BIRTH", "D", 8, 0}, {"AMOUNT", "N", 9, 2}},, .T., "persons") +PROCEDURE Main() - DBAPPEND(); AEVAL({PADR("Bil", 20), PADR("Gatwick", 20), STOD("19650124"), 123456.78}, {|X,Y| FIELDPUT(Y, X)}) - DBAPPEND(); AEVAL({PADR("Tom", 20), PADR("Heathrow", 20), STOD("19870512"), 9086.54}, {|X,Y| FIELDPUT(Y, X)}) - DBAPPEND(); AEVAL({PADR("John", 20), PADR("Weber", 20), STOD("19750306"), 2975.45}, {|X,Y| FIELDPUT(Y, X )}) - DBAPPEND(); AEVAL({PADR("Sim", 20), PADR("Simsom", 20), STOD("19930705"), 32975.37}, {|X,Y| FIELDPUT(Y, X )}) + rddSetDefault( "SQLMIX" ) + dbCreate( "persons", { { "NAME", "C", 20, 0 }, { "FAMILYNAME", "C", 20, 0 }, { "BIRTH", "D", 8, 0 }, { "AMOUNT", "N", 9, 2 } }, , .T. , "persons" ) - DBGOTOP() - BROWSE() + dbAppend(); AEval( { PadR( "Bil", 20 ), PadR( "Gatwick", 20 ), SToD( "19650124" ), 123456.78 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "Tom", 20 ), PadR( "Heathrow", 20 ), SToD( "19870512" ), 9086.54 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "John", 20 ), PadR( "Weber", 20 ), SToD( "19750306" ), 2975.45 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "Sim", 20 ), PadR( "Simsom", 20 ), SToD( "19930705" ), 32975.37 }, {| X, Y | FieldPut( Y, X ) } ) + + dbGoTop() + Browse() INDEX ON FIELD->AMOUNT TO amount - DBGOTOP() - BROWSE() - DBCLOSEALL() -RETURN + dbGoTop() + Browse() + dbCloseAll() + RETURN -PROC RDDSYS(); RETURN +PROCEDURE RDDSYS() ; RETURN diff --git a/harbour/contrib/xhb/cstruct.prg b/harbour/contrib/xhb/cstruct.prg index b8796092f9..f32ee6bef1 100644 --- a/harbour/contrib/xhb/cstruct.prg +++ b/harbour/contrib/xhb/cstruct.prg @@ -185,7 +185,7 @@ FUNCTION HB_CStructureID( cStructure, lInplace ) nID := aScan( s_aClasses, {| aClassInfo | aClassInfo[1] == cStructure } ) IF nID == 0 - nID := aScan( s_aSynonyms, {|aSynonym| aSynonym[1] == cStructure } ) + nID := aScan( s_aSynonyms, {| aSynonym | aSynonym[1] == cStructure } ) IF nID == 0 oErr := ErrorNew() oErr:Args := { cStructure, lInplace } @@ -552,7 +552,7 @@ STATIC FUNCTION Value() //LOCAL aValues := {} - //aEval( QSelf(), {|xVal| aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) + //aEval( QSelf(), {| xVal | aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) QSelf():InternalBuffer := HB_ArrayToStructure( QSelf(), QSelf():aCTypes, QSelf():nAlign ) @@ -566,7 +566,7 @@ STATIC FUNCTION DeValue( lAdopt ) //TraceLog( QSelf():ClassName(), QSelf():nAlign, Buffer, Len( Buffer ), lAdopt ) - //aEval( QSelf(), {|xVal| aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) + //aEval( QSelf(), {| xVal | aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) IF ! HB_ISSTRING( Buffer ) .OR. Len( Buffer ) == 0 //TraceLog( "EMPTY Buffer passed to " + ProcName() ) @@ -584,7 +584,7 @@ STATIC FUNCTION ArrayMethod() LOCAL aValues := {} - aEval( QSelf(), {|xVal| aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) + aEval( QSelf(), {| xVal | aAdd( aValues, xVal ) }, 1, Len( QSelf() ) - CLASS_PROPERTIES ) RETURN aValues diff --git a/harbour/contrib/xhb/dumpvar.prg b/harbour/contrib/xhb/dumpvar.prg index f86a1691a0..d3e0aefc51 100644 --- a/harbour/contrib/xhb/dumpvar.prg +++ b/harbour/contrib/xhb/dumpvar.prg @@ -375,7 +375,7 @@ STATIC FUNCTION __objGetMsgFullList( oObject, lData, nRange, nScope, nNoScope ) // nRange is already defaulted in ClassFullSel in classes.c - aMessages := ASort( oObject:ClassSel( nRange, nScope, .T. ),,, {|x,y| x[HB_OO_DATA_SYMBOL] < y[HB_OO_DATA_SYMBOL] } ) + aMessages := ASort( oObject:ClassSel( nRange, nScope, .T. ),,, {| x, y | x[HB_OO_DATA_SYMBOL] < y[HB_OO_DATA_SYMBOL] } ) aReturn := {} nFirstProperty := aScan( aMessages, {| aElement | Left( aElement[HB_OO_DATA_SYMBOL], 1 ) == '_' } ) diff --git a/harbour/contrib/xhb/trpc.prg b/harbour/contrib/xhb/trpc.prg index f19a5d2a42..ee39871db1 100644 --- a/harbour/contrib/xhb/trpc.prg +++ b/harbour/contrib/xhb/trpc.prg @@ -962,7 +962,7 @@ METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc ) CLASS tRPCServe CASE nMode == 1 // run in loop aSubst := AClone( aParams ) - nSubstPos := AScan( aParams, {|x| HB_ISSTRING( x ) .and. x == "$."} ) + nSubstPos := AScan( aParams, {| x | HB_ISSTRING( x ) .and. x == "$."} ) SWITCH aDesc[1] CASE 'A' // all results @@ -1015,7 +1015,7 @@ METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc ) CLASS tRPCServe CASE nMode == 2 // Run in a foreach loop aSubst := AClone( aParams ) - nSubstPos := AScan( aParams, {|x| HB_ISSTRING( x ) .and. x == "$."} ) + nSubstPos := AScan( aParams, {| x | HB_ISSTRING( x ) .and. x == "$."} ) SWITCH aDesc[1] CASE 'A' // all results @@ -1266,7 +1266,7 @@ METHOD Add( xFunction, cVersion, nLevel, oExec, oMethod ) ENDIF HB_MutexLock( ::mtxBusy ) - nElem := AScan( ::aFunctions, {|x| oFunction:cName == x:cName}) + nElem := AScan( ::aFunctions, {| x | oFunction:cName == x:cName}) IF nElem == 0 Aadd( ::aFunctions , oFunction ) lRet := .T. @@ -1280,7 +1280,7 @@ METHOD Find( cName ) class tRPCService LOCAL oRet := NIL HB_MutexLock( ::mtxBusy ) - nElem := AScan( ::aFunctions, {|x| upper(cName) == upper(x:cName)}) + nElem := AScan( ::aFunctions, {| x | upper(cName) == upper(x:cName)}) IF nElem != 0 oRet := ::aFunctions[ nElem ] ENDIF @@ -1293,7 +1293,7 @@ METHOD Remove( cName ) class tRPCService LOCAL lRet := .F. HB_MutexLock( ::mtxBusy ) - nElem := AScan( ::aFunctions, {|x| cName == x:cName}) + nElem := AScan( ::aFunctions, {| x | cName == x:cName}) IF nElem != 0 ADel( ::aFunctions, nElem ) ASize( ::aFunctions, Len( ::aFunctions ) - 1 ) @@ -1507,7 +1507,7 @@ METHOD Terminating( oConnection ) CLASS tRPCService ::OnClientTerminate( oConnection ) HB_MutexLock( ::mtxBusy ) - nToken := AScan( ::aServing, {|x| x == oConnection } ) + nToken := AScan( ::aServing, {| x | x == oConnection } ) IF nToken > 0 ADel( ::aServing, nToken ) ASize( ::aServing, Len( ::aServing ) -1 ) diff --git a/harbour/contrib/xhb/ttable.ch b/harbour/contrib/xhb/ttable.ch index 590b97606c..2d3d4c8fac 100644 --- a/harbour/contrib/xhb/ttable.ch +++ b/harbour/contrib/xhb/ttable.ch @@ -147,11 +147,11 @@ #xCommand ADD FIELD DATA [] TO ; => ; - :ClassAdd( <"cFld">,, {|Self| [] },,) + :ClassAdd( <"cFld">,, {| Self | [] },,) #xCommand DEFINE FIELD DATA [] TO ; => ; - :ClassAdd( <"cFld">,, {|Self| [] },,) + :ClassAdd( <"cFld">,, {| Self | [] },,) // --> ::undo() buffer constants diff --git a/harbour/contrib/xhb/txml.prg b/harbour/contrib/xhb/txml.prg index 975b8b3595..41949f1a8c 100644 --- a/harbour/contrib/xhb/txml.prg +++ b/harbour/contrib/xhb/txml.prg @@ -308,12 +308,12 @@ METHOD MatchCriteria( oFound ) CLASS TXmlIteratorRegex ENDIF IF ::cAttribute != NIL .and. ; - hb_hScan( oFound:aAttributes, {|cKey| HB_REGEXLIKE( ::cAttribute, cKey, .t. ) } ) == 0 + hb_hScan( oFound:aAttributes, {| cKey | HB_REGEXLIKE( ::cAttribute, cKey, .t. ) } ) == 0 RETURN .F. ENDIF IF ::cValue != NIL .and. ; - hb_hScan( oFound:aAttributes, {|xKey, cValue| HB_SYMBOL_UNUSED( xKey ), HB_REGEXLIKE( ::cValue, cValue, .t. ) } ) == 0 + hb_hScan( oFound:aAttributes, {| xKey, cValue | HB_SYMBOL_UNUSED( xKey ), HB_REGEXLIKE( ::cValue, cValue, .t. ) } ) == 0 RETURN .F. ENDIF diff --git a/harbour/contrib/xhb/xcstr.prg b/harbour/contrib/xhb/xcstr.prg index 4711fd7e10..00e405beb1 100644 --- a/harbour/contrib/xhb/xcstr.prg +++ b/harbour/contrib/xhb/xcstr.prg @@ -159,8 +159,8 @@ FUNCTION ValToPrg( xVal, cName, nPad, aObjs ) aObjs := {} cRet := cName + " := " ELSE - IF ( nObj := aScan( aObjs, {|a| HB_ArrayID( a[1] ) == HB_ArrayID( xVal ) } ) ) > 0 - RETURN aObjs[ nObj ][2] + " /* Cyclic */" + IF ( nObj := aScan( aObjs, {| a | HB_ArrayID( a[ 1 ] ) == HB_ArrayID( xVal ) } ) ) > 0 + RETURN aObjs[ nObj ][ 2 ] + " /* Cyclic */" ENDIF cRet := "" @@ -216,8 +216,8 @@ FUNCTION ValToPrg( xVal, cName, nPad, aObjs ) aObjs := {} cRet := cName + " := " ELSE - IF ( nObj := aScan( aObjs, {|a| HB_ArrayID( a[1] ) == HB_ArrayID( xVal ) } ) ) > 0 - RETURN aObjs[ nObj ][2] + " /* Cyclic */" + IF ( nObj := aScan( aObjs, {| a | HB_ArrayID( a[ 1 ] ) == HB_ArrayID( xVal ) } ) ) > 0 + RETURN aObjs[ nObj ][ 2 ] + " /* Cyclic */" ENDIF cRet := "" diff --git a/harbour/contrib/xhb/xdbmodst.prg b/harbour/contrib/xhb/xdbmodst.prg index 499ac138d8..d48df3776e 100644 --- a/harbour/contrib/xhb/xdbmodst.prg +++ b/harbour/contrib/xhb/xdbmodst.prg @@ -78,7 +78,7 @@ FUNCTION dbModifyStructure( cFile ) LOCAL nSourceArea LOCAL cDateTime := SubStr( dtos( Date() ), 3 ) + "." + StrTran( Left( Time(), 5 ), ":", "." ) - BEGIN SEQUENCE WITH {|oErr| Break( oErr )} + BEGIN SEQUENCE WITH {| oErr | Break( oErr ) } // Open exclusively, get name info, and create the structure db. //-------------------------------------------------------------// @@ -219,7 +219,7 @@ FUNCTION dbMerge( xSource, lAppend ) nSourcePos := (nSource)->( FieldPos( cField ) ) IF nSourcePos > 0 - BEGIN SEQUENCE WITH {|oErr| Break( oErr )} + BEGIN SEQUENCE WITH {| oErr | Break( oErr ) } // Save xField := FieldGet( cField:__EnumIndex() ) @@ -230,11 +230,11 @@ FUNCTION dbMerge( xSource, lAppend ) FieldPut( cField:__EnumIndex(), xField ) // Ok to process - aAdd( aTranslate, { cField:__EnumIndex(), nSourcePos, {|xSource| xSource } } ) + aAdd( aTranslate, { cField:__EnumIndex(), nSourcePos, {| xSource | xSource } } ) RECOVER // USING oErr cTargetType := ValType( FieldGet( cField:__EnumIndex() ) ) - BEGIN SEQUENCE WITH {|oErr| Break( oErr )} + BEGIN SEQUENCE WITH {| oErr | Break( oErr ) } // Test type compatability FieldPut( cField:__EnumIndex(), ValToType( (nSource)->( FieldGet( nSourcePos ) ), cTargetType ) ) @@ -242,7 +242,7 @@ FUNCTION dbMerge( xSource, lAppend ) FieldPut( cField:__EnumIndex(), xField ) // Ok to process - aAdd( aTranslate, { cField:__EnumIndex(), nSourcePos, {|xSource| ValToType( xSource, cTargetType ) } } ) + aAdd( aTranslate, { cField:__EnumIndex(), nSourcePos, {| xSource | ValToType( xSource, cTargetType ) } } ) RECOVER // USING oErr //TraceLog( oErr:Description, oErr:Operation ) END SEQUENCE diff --git a/harbour/doc/en/command.txt b/harbour/doc/en/command.txt index 52a68fc302..abac865018 100644 --- a/harbour/doc/en/command.txt +++ b/harbour/doc/en/command.txt @@ -283,7 +283,7 @@ * methods that need parameters. The first parameter to * must be Self, as in: * - * METHOD BLOCK {|Self,,, ...,|...} + * METHOD BLOCK {| Self, , , ..., | ... } * * EXTERN If an external function does what the method needs, * use this clause to make an optimized call to that @@ -307,8 +307,8 @@ * VAR hWnd, nOldProc * METHOD New( ) CONSTRUCTOR * METHOD Capture() INLINE SetCapture( ::hWnd ) - * METHOD End() BLOCK {| Self, lEnd | If( lEnd := ::lValid(),; - * ::PostMsg( WM_CLOSE ),), lEnd } + * METHOD End() BLOCK {| Self, lEnd | iif( lEnd := ::lValid(),; + * ::PostMsg( WM_CLOSE ), ), lEnd } * METHOD EraseBkGnd( hDC ) * METHOD cTitle( cNewTitle ) SETGET * METHOD Close() VIRTUAL diff --git a/harbour/doc/en/hvm.txt b/harbour/doc/en/hvm.txt index 355151b463..73fbc12881 100644 --- a/harbour/doc/en/hvm.txt +++ b/harbour/doc/en/hvm.txt @@ -48,12 +48,12 @@ * $TESTS$ * This test will show the functions and procedures in stack. * before executing it. - * function Test() + * PROCEDURE Main() * LOCAL n := 1 - * while !Empty( ProcName( n ) ) + * DO WHILE ! Empty( ProcName( n ) ) * ? ProcName( n++ ) - * end do - * return nil + * ENDDO + * RETURN * $STATUS$ * R * $COMPLIANCE$ @@ -90,10 +90,10 @@ * $EXAMPLES$ * See Test * $TESTS$ - * function Test() + * PROCEDURE Main() * ? ProcLine( 0 ) * ? ProcName( 2 ) - * return nil + * RETURN * $STATUS$ * R * $COMPLIANCE$ @@ -128,11 +128,11 @@ * $EXAMPLES$ * ? ProcFile() * $TESTS$ - * function Test() + * PROCEDURE Main() * ? ProcFile() * ? ProcFile( NIL ) * ? ProcFile( 2 ) - * return nil + * RETURN * $STATUS$ * R * $COMPLIANCE$ @@ -166,12 +166,12 @@ * $EXAMPLES$ * See Test * $TESTS$ - * function Test( nValue, cString ) - * if PCount() == 2 + * PROCEDURE Test( nValue, cString ) + * IF PCount() == 2 * ? hb_PValue( 1 ), nValue * ? hb_PValue( 2 ), cString - * endif - * return nil + * ENDIF + * RETURN * $STATUS$ * R * $COMPLIANCE$ @@ -207,13 +207,13 @@ * $EXAMPLES$ * See Test * $TESTS$ - * function Test( xExp ) - * if PCount() == 0 + * PROCEDURE Test( xExp ) + * IF PCount() == 0 * ? "This function needs a parameter" - * else + * ELS * ? xExp - * endif - * return nil + * ENDIF + * RETURN * $STATUS$ * R * $COMPLIANCE$ @@ -246,11 +246,11 @@ * $EXAMPLES$ * See Test * $TESTS$ - * function EndApp( lYesNo ) - * if lYesNo + * PROCEDURE EndApp( lYesNo ) + * IF lYesNo * __Quit() - * endif - * return nil + * ENDIF + * RETURN * $STATUS$ * R * $COMPLIANCE$ @@ -391,11 +391,11 @@ * It is also used internally to implement DO WITH * In this case is of type HB_SYMB. * $EXAMPLES$ - * cbCode ={|x| MyFunc( x )} - * DO( cbCode, 1 ) + * cbCode := {| x | MyFunc( x ) } + * Do( cbCode, 1 ) * * cFunction := "MyFunc" - * xRetVal := DO( cFunction, 2 ) + * xRetVal := Do( cFunction, 2 ) * * // Old style (slower): * DO &cFunction WITH 3 diff --git a/harbour/doc/en/menu.txt b/harbour/doc/en/menu.txt index b304730aa7..66d8612fc6 100644 --- a/harbour/doc/en/menu.txt +++ b/harbour/doc/en/menu.txt @@ -31,9 +31,9 @@ * * - leftmost row used to display array (default 0) * - * - bottommost row used to display array (default MAXROW()) + * - bottommost row used to display array (default MaxRow()) * - * - rightmost row used to display array (default MAXCOL()) + * - rightmost row used to display array (default MaxCol()) * * - the character array of items from which to select * @@ -61,8 +61,8 @@ * - a codeblock to be called which may * affect special processing of keystrokes. It * should be specified in the form - * {|nMode, nCurElemenet, nRowPos| ; - * MyFunc(nMode, nCurElemenet, nRowPos) }. + * {| nMode, nCurElemenet, nRowPos | ; + * MyFunc( nMode, nCurElemenet, nRowPos ) }. * Default NIL. * * - the number of the element to be highlighted as @@ -80,7 +80,7 @@ * additional detail. * $EXAMPLES$ * aItems := { "One", "Two", "Three" } - * nChoice := ACHOICE( 10, 10, 20, 20, aItems ) + * nChoice := AChoice( 10, 10, 20, 20, aItems ) * IF nChoice == 0 * ? "You did not choose an item" * ELSE @@ -111,10 +111,10 @@ * __AtPrompt( , , , [] ) --> .F. * $ARGUMENTS$ * is the row number to display the menu . Value could - * range from zero to MAXROW(). + * range from zero to MaxRow(). * * is the column number to display the menu . Value - * could range from zero to MAXCOL(). + * could range from zero to MaxCol(). * * is the menu item character string to display. * @@ -176,10 +176,10 @@ * @ , PROMPT [MESSAGE ] * $ARGUMENTS$ * is the row number to display the menu . Value could - * range from zero to MAXROW(). + * range from zero to MaxRow(). * * is the column number to display the menu . Value - * could range from zero to MAXCOL(). + * could range from zero to MaxCol(). * * is the menu item character string to display. * @@ -282,7 +282,7 @@ * First letter Select next menu with the same first letter, * | return this item position. * - * upon exit the cursor is placed at MAXROW()-1, 0 + * upon exit the cursor is placed at MaxRow()-1, 0 * __MenuTo() can be nested without loosing the previous prompts. * * MENU TO command is preprocessed into __MenuTo() function during @@ -290,14 +290,14 @@ * $EXAMPLES$ * // display menu item on each screen corner and let user select one * CLS - * SET MESSAGE TO MAXROW() / 2 CENTER + * SET MESSAGE TO MaxRow() / 2 CENTER * SET WRAP ON * @ 0 , 0 PROMPT "1. Upper left" MESSAGE " One " - * @ 0 , MAXCOL()-16 PROMPT "2. Upper right" MESSAGE " Two " - * @ MAXROW() - 1, MAXCOL()-16 PROMPT "3. Bottom right" MESSAGE "Three" - * @ MAXROW() - 1, 0 PROMPT "4. Bottom left" MESSAGE "Four " + * @ 0 , MaxCol()-16 PROMPT "2. Upper right" MESSAGE " Two " + * @ MaxRow() - 1, MaxCol()-16 PROMPT "3. Bottom right" MESSAGE "Three" + * @ MaxRow() - 1, 0 PROMPT "4. Bottom left" MESSAGE "Four " * MENU TO nChoice - * SETPOS( MAXROW() / 2, MAXCOL() / 2 - 10 ) + * SetPos( MaxRow() / 2, MaxCol() / 2 - 10 ) * IF nChoice == 0 * ?? "Esc was pressed" * ELSE @@ -368,7 +368,7 @@ * First letter - Select next menu with the same first letter, * | return this item position. * - * upon exit the cursor is placed at MAXROW()-1, 0 + * upon exit the cursor is placed at MaxRow()-1, 0 * Menu To can be nested without loosing the previous prompts. * * MENU TO command is preprocessed into __MenuTo() function during @@ -376,14 +376,14 @@ * $EXAMPLES$ * // display menu item on each screen corner and let user select one * CLS - * SET MESSAGE TO MAXROW() / 2 CENTER + * SET MESSAGE TO MaxRow() / 2 CENTER * SET WRAP ON * @ 0 , 0 PROMPT "1. Upper left" MESSAGE " One " - * @ 0 , MAXCOL() - 16 PROMPT "2. Upper right" MESSAGE " Two " - * @ MAXROW() - 1, MAXCOL() - 16 PROMPT "3. Bottom right" MESSAGE "Three" - * @ MAXROW() - 1, 0 PROMPT "4. Bottom left" MESSAGE "Four " + * @ 0 , MaxCol() - 16 PROMPT "2. Upper right" MESSAGE " Two " + * @ MaxRow() - 1, MaxCol() - 16 PROMPT "3. Bottom right" MESSAGE "Three" + * @ MaxRow() - 1, 0 PROMPT "4. Bottom left" MESSAGE "Four " * MENU TO nChoice - * SETPOS( MAXROW() / 2, MAXCOL() / 2 - 10 ) + * SetPos( MaxRow() / 2, MaxCol() / 2 - 10 ) * IF nChoice == 0 * ?? "Esc was pressed" * ELSE diff --git a/harbour/doc/en/tbrowse.txt b/harbour/doc/en/tbrowse.txt index a9485f5db1..7ad912934e 100644 --- a/harbour/doc/en/tbrowse.txt +++ b/harbour/doc/en/tbrowse.txt @@ -214,39 +214,39 @@ * * Inkey Value Code Block * - * K_DOWN {|Ob,nKey| Ob:Down(),0} - * K_END {|Ob,nKey| Ob:End(),0} - * K_CTRL_PGDN {|Ob,nKey| Ob:GoBottom(),0} - * K_CTRL_PGUP {|Ob,nKey| Ob:GoTop(),0} - * K_HOME {|Ob,nKey| Ob:Home(),0} - * K_LEFT {|Ob,nKey| Ob:Left(),0} - * K_PGDN {|Ob,nKey| Ob:PageDown(),0} - * K_PGUP {|Ob,nKey| Ob:PageUp(),0} - * K_CTRL_END {|Ob,nKey| Ob:PanEnd(),0} - * K_CTRL_HOME {|Ob,nKey| Ob:PanHome(),0} - * K_CTRL_LEFT {|Ob,nKey| Ob:PanLeft(),0} - * K_CTRL_RIGHT {|Ob,nKey| Ob:PanRight(),0} - * K_RIGHT {|Ob,nKey| Ob:Right(),0} - * K_UP {|Ob,nKey| Ob:Up(),0} - * K_ESC {|Ob,nKey| -1 } + * K_DOWN {| oB, nKey | oB:Down(), 0 } + * K_END {| oB, nKey | oB:End(), 0 } + * K_CTRL_PGDN {| oB, nKey | oB:GoBottom(), 0 } + * K_CTRL_PGUP {| oB, nKey | oB:GoTop(), 0 } + * K_HOME {| oB, nKey | oB:Home(), 0 } + * K_LEFT {| oB, nKey | oB:Left(), 0 } + * K_PGDN {| oB, nKey | oB:PageDown(), 0 } + * K_PGUP {| oB, nKey | oB:PageUp(), 0 } + * K_CTRL_END {| oB, nKey | oB:PanEnd(), 0 } + * K_CTRL_HOME {| oB, nKey | oB:PanHome(), 0 } + * K_CTRL_LEFT {| oB, nKey | oB:PanLeft(), 0 } + * K_CTRL_RIGHT {| oB, nKey | oB:PanRight(), 0 } + * K_RIGHT {| oB, nKey | oB:Right(), 0 } + * K_UP {| oB, nKey | oB:Up(), 0 } + * K_ESC {| oB, nKey | -1 } *
* * The keys handlers can be queried,added and replace an removed from * the internal keyboard dictionary. See the example. * - * oTb:SETKEY( K_TAB,{|oTb,nKey| -1}) + * oTb:SETKEY( K_TAB, {| oTb, nKey | -1 } ) * * An default key handler can be declared by specifyin a value of 0 * for . It associate code block will be evaluated each time * TBrowse:Applykey() is called with an key value that is not contained * in the dictionary. For example * - * oTb:SetKey(0,{|oTb,nKey| DefKeyHandler(otb,nkey}) + * oTb:SetKey( 0, {| oTb, nKey | DefKeyHandler( otb, nkey } ) * This call the a function named DefKeyHandler() when nKey is not * contained in the dictionary. * * To remove an keypress/code block definition, specify NIL for - * oTb:SetKey(K_ESC,nil) + * oTb:SetKey( K_ESC, NIL ) * $EXAMPLES$ * oTb:SeyKey( K_F10, {| otb, nkey | ShowListByname( otb ) } * $END$ diff --git a/harbour/extras/gtwvw/gtwvw.c b/harbour/extras/gtwvw/gtwvw.c index ae3a37fa04..e3fac996d3 100644 --- a/harbour/extras/gtwvw/gtwvw.c +++ b/harbour/extras/gtwvw/gtwvw.c @@ -101,7 +101,7 @@ #define SubclassWindow(hwnd, lpfn) \ ((WNDPROC)SetWindowLongPtr((hwnd), GWLP_WNDPROC, (LPARAM)(WNDPROC)(lpfn))) -/*-------------------------------------------------------------------*/ + /* settable by user: ****************************************************/ @@ -197,7 +197,7 @@ static int K_Ctrl[] = { K_CTRL_Y, K_CTRL_Z }; -/*-------------------------------------------------------------------*/ + /* */ /* private functions declaration */ /* */ @@ -337,7 +337,7 @@ static void ReposControls(UINT usWinNum, BYTE byCtrlClass); static BOOL hb_wvw_Move_Ready( BOOL b_p_IsReady ); static BOOL hb_wvw_Size_Ready( BOOL b_p_SizeIsReady ); -/*-------------------------------------------------------------------*/ + /* */ /* mouse initialization was made in cmdarg.c */ /* */ @@ -396,15 +396,15 @@ LONG GetFontDialogUnits(HWND h,HFONT f) } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* GT Specific Functions */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + static void hb_gt_wvw_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr ) { @@ -510,7 +510,7 @@ static void hb_gt_wvw_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwDestroyPicture( IPicture * iPicture ) { @@ -524,7 +524,7 @@ BOOL hb_gt_wvwDestroyPicture( IPicture * iPicture ) return bResult; } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_Exit( PHB_GT pGT ) //void gt_Exit( void ) @@ -759,7 +759,7 @@ static void hb_gt_wvw_Exit( PHB_GT pGT ) hb_xfree( s_pWvwData ) ; } -/*-------------------------------------------------------------------*/ + void hb_gt_wvw_SetPos(PHB_GT pGT, int iRow, int iCol ) { @@ -793,7 +793,7 @@ static int hb_gt_wvw_MaxCol( PHB_GT pGT ) return s_pWvwData->s_pWindows[ s_pWvwData->s_usCurWindow ]->COLS - 1; } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_MaxRow( PHB_GT pGT ) { HB_SYMBOL_UNUSED( pGT ); @@ -801,7 +801,7 @@ static int hb_gt_wvw_MaxRow( PHB_GT pGT ) } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvw_IsColor( PHB_GT pGT ) { @@ -812,7 +812,7 @@ BOOL hb_gt_wvw_IsColor( PHB_GT pGT ) return( TRUE ); } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_GetCursorStyle( PHB_GT pGT ) { @@ -823,7 +823,7 @@ static int hb_gt_wvw_GetCursorStyle( PHB_GT pGT ) return( s_iCursorStyle ); } -/*-------------------------------------------------------------------*/ + /*NOTE: works on TOPMOST window, NOT Current Window! * (caret exists only in TOPMOST window) @@ -879,7 +879,7 @@ static void hb_gt_wvw_SetCursorStyle( PHB_GT pGT, int iStyle ) hb_gt_wvwSetCaretOn( pWindowData, bCursorOn ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_DispBegin( PHB_GT pGT ) { @@ -891,7 +891,7 @@ static void hb_gt_wvw_DispBegin( PHB_GT pGT ) hb_gt_wvw_vDispBegin( s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ] ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_DispEnd( PHB_GT pGT ) { @@ -903,7 +903,7 @@ static void hb_gt_wvw_DispEnd( PHB_GT pGT ) hb_gt_wvw_vDispEnd( s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ] ); } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_DispCount( PHB_GT pGT ) { @@ -915,7 +915,7 @@ static int hb_gt_wvw_DispCount( PHB_GT pGT ) return( hb_gt_wvw_usDispCount( s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ] ) ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_Replicate( PHB_GT pGT, int iRow, int iCol, int bColor, BYTE bAttr, USHORT usChar, ULONG ulLen ) { @@ -938,7 +938,7 @@ static void hb_gt_wvw_Replicate( PHB_GT pGT, int iRow, int iCol, int bColor, BYT } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_PutText( PHB_GT pGT, int iRow, int iCol, int bColor, const char * pText, ULONG ulLen ) { @@ -961,7 +961,7 @@ static void hb_gt_wvw_PutText( PHB_GT pGT, int iRow, int iCol, int bColor, const } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_SetAttribute( PHB_GT pGT, int iTop, int iLeft, int iBottom, int iRight, int bColor ) { @@ -984,7 +984,7 @@ static void hb_gt_wvw_SetAttribute( PHB_GT pGT, int iTop, int iLeft, int iBottom } } -/*-------------------------------------------------------------------*/ + /* */ /* copied from gtwin... */ /* */ @@ -1118,7 +1118,7 @@ static void hb_gt_wvw_Scroll(PHB_GT pGT, int iTop, int iLeft, int iBottom, int i #endif } -/*-------------------------------------------------------------------*/ + /* */ /* resize the ( existing ) window */ /* */ @@ -1140,7 +1140,7 @@ static BOOL hb_gt_wvw_SetMode( PHB_GT pGT, int iRow, int iCol ) return( hb_gt_wvw_bSetMode( s_pWvwData->s_pWindows[ s_pWvwData->s_usCurWindow ], (USHORT)iRow, (USHORT)iCol) ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_WriteAt( PHB_GT pGT, int iRow, int iCol, const char * pText, ULONG ulLength ) { HB_GTSELF_PUTTEXT( pGT, iRow, iCol, (BYTE)HB_GTSELF_GETCOLOR( pGT ), pText, ulLength ); @@ -1149,7 +1149,7 @@ static void hb_gt_wvw_WriteAt( PHB_GT pGT, int iRow, int iCol, const char * pTex HB_GTSELF_SETPOS( pGT, iRow, iCol + ( int ) ulLength ); } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvw_GetBlink( PHB_GT pGT ) { @@ -1158,7 +1158,7 @@ static BOOL hb_gt_wvw_GetBlink( PHB_GT pGT ) return( TRUE ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_SetBlink( PHB_GT pGT, BOOL bBlink ) { @@ -1167,7 +1167,7 @@ static void hb_gt_wvw_SetBlink( PHB_GT pGT, BOOL bBlink ) HB_SYMBOL_UNUSED( bBlink ); } -/*-------------------------------------------------------------------*/ + static const char * hb_gt_wvw_Version( PHB_GT pGT, int iType ) { @@ -1327,7 +1327,7 @@ static void hb_gt_wvw_VertLine( PHB_GT pGT, int iCol, int iTop, int iBottom, USH } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_OutStd( PHB_GT pGT, const char * pbyStr, HB_SIZE ulLen ) { @@ -1335,7 +1335,7 @@ static void hb_gt_wvw_OutStd( PHB_GT pGT, const char * pbyStr, HB_SIZE ulLen ) hb_fsWriteLarge( s_iStdOut, ( BYTE * ) pbyStr, ulLen ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_OutErr( PHB_GT pGT, const char * pbyStr, HB_SIZE ulLen ) { @@ -1343,7 +1343,7 @@ static void hb_gt_wvw_OutErr( PHB_GT pGT, const char * pbyStr, HB_SIZE ulLen ) hb_fsWriteLarge( s_iStdErr, ( BYTE * ) pbyStr, ulLen ); } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvwGetCharFromInputQueue ( int *c ) { @@ -1379,7 +1379,7 @@ static BOOL hb_gt_wvwGetCharFromInputQueue ( int *c ) } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_ReadKey( PHB_GT pGT, int eventmask ) { @@ -1399,7 +1399,7 @@ static int hb_gt_wvw_ReadKey( PHB_GT pGT, int eventmask ) } -/*-------------------------------------------------------------------*/ + /* */ /* dDuration is in 'Ticks' (18.2 per second) */ /* */ @@ -1412,7 +1412,7 @@ static void hb_gt_wvw_Tone( PHB_GT pGT, double dFrequency, double dDuration ) hb_gt_winapi_tone( dFrequency, dDuration ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_mouse_Init( PHB_GT pGT ) { @@ -1422,7 +1422,7 @@ static void hb_gt_wvw_mouse_Init( PHB_GT pGT ) } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_mouse_Exit( PHB_GT pGT ) { @@ -1430,7 +1430,7 @@ static void hb_gt_wvw_mouse_Exit( PHB_GT pGT ) hb_wvw_vmouse_Exit(); } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvw_mouse_IsPresent( PHB_GT pGT ) { @@ -1439,7 +1439,7 @@ static BOOL hb_gt_wvw_mouse_IsPresent( PHB_GT pGT ) } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_mouse_Col( PHB_GT pGT ) { @@ -1454,7 +1454,7 @@ static int hb_gt_wvw_mouse_Col( PHB_GT pGT ) } } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_mouse_Row( PHB_GT pGT ) { @@ -1469,7 +1469,7 @@ static int hb_gt_wvw_mouse_Row( PHB_GT pGT ) } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_mouse_SetPos( PHB_GT pGT, int iRow, int iCol ) { @@ -1493,7 +1493,7 @@ static void hb_gt_wvw_mouse_SetPos( PHB_GT pGT, int iRow, int iCol ) } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvw_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol ) { @@ -1506,7 +1506,7 @@ static void hb_gt_wvw_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol ) } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvw_mouse_ButtonState( PHB_GT pGT, int iButton ) { HB_TRACE( HB_TR_DEBUG, ("hb_gt_wvw_mouse_ButtonState(%p,%i)", pGT, iButton) ); @@ -1524,7 +1524,7 @@ static BOOL hb_gt_wvw_mouse_ButtonState( PHB_GT pGT, int iButton ) } return FALSE; } -/*-------------------------------------------------------------------*/ + static int hb_gt_wvw_mouse_CountButton( PHB_GT pGT ) { @@ -2098,12 +2098,12 @@ void gt_gfxText( int iTop, int iLeft, char *cBuf, int iColor, int iSize, int iWi /* ******** Graphics API end ******** */ -/*-------------------------------------------------------------------* +/* * * Modeless Dialogs Implementation * copied and modified from Pritpal Bedi's work in GTWVT * - *-------------------------------------------------------------------*/ + */ BOOL CALLBACK hb_gt_wvwDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -2255,7 +2255,7 @@ BOOL CALLBACK hb_gt_wvwDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA return bReturn; } -/*-------------------------------------------------------------------*/ + BOOL CALLBACK hb_gt_wvwDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -2410,15 +2410,15 @@ BOOL CALLBACK hb_gt_wvwDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA return bReturn; } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* WVW specific functions */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + static void hb_gt_wvwCreateObjects( UINT usWinNum ) { @@ -2469,7 +2469,7 @@ static void hb_gt_wvwCreateObjects( UINT usWinNum ) } -/*-------------------------------------------------------------------*/ + /*NOTE/TODO: this doesn't take MenuBar into account */ static USHORT hb_gt_wvwCalcPixelHeight( WIN_DATA * pWindowData ) @@ -2480,14 +2480,14 @@ static USHORT hb_gt_wvwCalcPixelHeight( WIN_DATA * pWindowData ) pWindowData->usTBHeight); } -/*-------------------------------------------------------------------*/ + static USHORT hb_gt_wvwCalcPixelWidth( WIN_DATA * pWindowData ) { return( (USHORT) pWindowData->PTEXTSIZE.x*pWindowData->COLS ); } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvwAllocSpBuffer( WIN_DATA * pWindowData, USHORT col, USHORT row ) { @@ -2516,7 +2516,7 @@ static BOOL hb_gt_wvwAllocSpBuffer( WIN_DATA * pWindowData, USHORT col, USHORT r return( bRet ); } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvwInitWindow( WIN_DATA * pWindowData, HWND hWnd, USHORT col, USHORT row ) { @@ -2528,7 +2528,7 @@ static BOOL hb_gt_wvwInitWindow( WIN_DATA * pWindowData, HWND hWnd, USHORT col, return( bRet ); } -/*-------------------------------------------------------------------*/ + /* WVT commented out this function. WVW is still using it. */ @@ -2590,7 +2590,7 @@ static BOOL hb_gt_wvwValidWindowSize( WIN_DATA * pWindowData, int rows, int cols return( ( width <= maxWidth ) && ( height <= maxHeight ) ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwResetWindowSize( WIN_DATA * pWindowData, HWND hWnd ) { @@ -2824,7 +2824,7 @@ static void hb_gt_wvwResetWindowSize( WIN_DATA * pWindowData, HWND hWnd ) } -/*-------------------------------------------------------------------*/ + static int hb_wvw_key_ansi_to_oem( int c ) { @@ -2838,7 +2838,7 @@ static int hb_wvw_key_ansi_to_oem( int c ) return c; } -/*-------------------------------------------------------------------*/ + static void xUserPaintNow( UINT usWinNum ) { @@ -2883,7 +2883,7 @@ static void xUserPaintNow( UINT usWinNum ) bRunning = FALSE; } -/*-------------------------------------------------------------------*/ + static void xUserTimerNow( UINT usWinNum, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -2917,7 +2917,7 @@ static void xUserTimerNow( UINT usWinNum, HWND hWnd, UINT message, WPARAM wParam bRunning = FALSE; } -/*-------------------------------------------------------------------*/ + static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -4154,7 +4154,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam return( DefWindowProc( hWnd, message, wParam, lParam ) ); } -/*-------------------------------------------------------------------*/ + static BOOL hb_wvw_Move_Ready( BOOL b_p_IsReady ) { static BOOL s_bIsReady = FALSE; @@ -4166,7 +4166,7 @@ static BOOL hb_wvw_Move_Ready( BOOL b_p_IsReady ) return(s_bIsReady); } -/*-------------------------------------------------------------------*/ + static BOOL hb_wvw_Size_Ready( BOOL b_p_SizeIsReady ) { static BOOL s_bSizeIsReady = FALSE; @@ -4178,7 +4178,7 @@ static BOOL hb_wvw_Size_Ready( BOOL b_p_SizeIsReady ) return( s_bSizeIsReady ); } -/*-------------------------------------------------------------------*/ + static HWND hb_gt_wvwCreateWindow( HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow ) { @@ -4254,7 +4254,7 @@ static HWND hb_gt_wvwCreateWindow( HINSTANCE hInstance, HINSTANCE hPrevInstance, return( hWnd ) ; } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwCreateToolTipWindow( WIN_DATA * pWindowData ) { @@ -4313,7 +4313,7 @@ static void hb_gt_wvwCreateToolTipWindow( WIN_DATA * pWindowData ) pWindowData->hWndTT = hWndTT; } -/*-------------------------------------------------------------------*/ + DWORD hb_gt_wvwProcessMessages( WIN_DATA * pWindowData ) { @@ -4378,7 +4378,7 @@ DWORD hb_gt_wvwProcessMessages( WIN_DATA * pWindowData ) } -/*-------------------------------------------------------------------*/ + POINT hb_gt_wvwGetXYFromColRow( WIN_DATA * pWindowData, USHORT col, USHORT row ) { @@ -4393,7 +4393,7 @@ POINT hb_gt_wvwGetXYFromColRow( WIN_DATA * pWindowData, USHORT col, USHORT row ) return( xy ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwUnreachedXY( WIN_DATA * pWindowData, int *cols, int *rows ) { @@ -4415,7 +4415,7 @@ static void hb_gt_wvwUnreachedXY( WIN_DATA * pWindowData, int *cols, int *rows ) if (cols) (*cols) = ci.right - xy.x; } -/*-------------------------------------------------------------------*/ + /* * get the row and column from xy pixel client coordinates @@ -4446,7 +4446,7 @@ static POINT hb_gt_wvwTBGetColRowFromXY( WIN_DATA * pWindowData, USHORT x, USHOR return( colrow ); } -/*-------------------------------------------------------------------*/ + /* * return a rectangle with row and column data, corresponding to the XY pixel * coordinates @@ -4475,7 +4475,7 @@ RECT hb_gt_wvwGetColRowFromXYRect( WIN_DATA * pWindowData, RECT xy ) return( colrow ); } -/*-------------------------------------------------------------------*/ + /* * return a rectangle with the XY pixel coordinates corresponding to * the row and column data @@ -4501,7 +4501,7 @@ RECT hb_gt_wvwGetXYFromColRowRect( WIN_DATA * pWindowData, RECT colrow ) return( xy ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwCreateCaret(WIN_DATA * pWindowData) { @@ -4532,7 +4532,7 @@ static void hb_gt_wvwCreateCaret(WIN_DATA * pWindowData) } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwKillCaret( WIN_DATA * pWindowData ) { @@ -4545,7 +4545,7 @@ static void hb_gt_wvwKillCaret( WIN_DATA * pWindowData ) } } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwSetCaretPos converts col and row to x and y ( pixels ) and calls * the Windows function SetCaretPos ( with the expected coordinates ) @@ -4583,7 +4583,7 @@ static BOOL hb_gt_wvwSetCaretPos(WIN_DATA * pWindowData) return( TRUE ); } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwValidateRow checks the row bounds for the caret, wrapping if indicated */ @@ -4616,7 +4616,7 @@ static void hb_gt_wvwValidateRow( WIN_DATA * pWindowData ) } } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwValidateCol checks the column bounds for the caret, wrapping if indicated */ @@ -4649,7 +4649,7 @@ static void hb_gt_wvwValidateCol( WIN_DATA * pWindowData ) } } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwValidateCaret checks the bounds for the caret, wrapping if indicated * before setting the caret position on the screen @@ -4665,7 +4665,7 @@ static void hb_gt_wvwValidateCaret( WIN_DATA * pWindowData ) SendMessage( pWindowData->hWnd, WM_MY_UPDATE_CARET, 0, 0 ); } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwGetIndexForTextBuffer takes a row and column, and returns the appropriate * index into the screen Text buffer @@ -4676,7 +4676,7 @@ static USHORT hb_gt_wvwGetIndexForTextBuffer( WIN_DATA * pWindowData, USHORT col return( row * pWindowData->COLS + col ); } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwGetColRowForTextBuffer takes an index into the screen Text buffer * and returns the corresponding row and column @@ -4691,7 +4691,7 @@ static POINT hb_gt_wvwGetColRowForTextBuffer( WIN_DATA * pWindowData, USHORT ind return( colrow ); } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwTextOut converts col and row to x and y ( pixels ) and calls * the Windows function TextOut with the expected coordinates @@ -4726,7 +4726,7 @@ static BOOL hb_gt_wvwTextOut( WIN_DATA * pWindowData, HDC hdc, USHORT col, USHO return( Result ) ; } -/*-------------------------------------------------------------------*/ + /* */ /* get for and background colours from attribute and set them for window */ @@ -4745,7 +4745,7 @@ static BOOL hb_gt_wvwSetColors( WIN_DATA * pWindowData, HDC hdc, BYTE attr ) return( TRUE ); } -/*-------------------------------------------------------------------*/ + /* */ /* compute invalid rect in pixels, from row and col */ @@ -4788,7 +4788,7 @@ static void hb_gt_wvwSetInvalidRect( WIN_DATA * pWindowData, USHORT left, USHORT } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwDoInvalidateRect( WIN_DATA * pWindowData ) { @@ -4803,7 +4803,7 @@ static void hb_gt_wvwDoInvalidateRect( WIN_DATA * pWindowData ) } } -/*-------------------------------------------------------------------*/ + /*NOTE: this function is called when after a key event occurs. * since we are accepting input only from focused topmost window, no need to handle input on other window @@ -4846,7 +4846,7 @@ static int hb_gt_wvwJustTranslateKey( int key, int shiftkey, int altkey, int con } } -/*-------------------------------------------------------------------*/ + /* */ /* font stuff */ /* use the standard fixed oem font, unless the caller has requested set size fonts @@ -4886,7 +4886,7 @@ HFONT hb_gt_wvwGetFont( const char * pszFace, int iHeight, int iWidth, int iWeig } -/*-------------------------------------------------------------------*/ + static void hb_gtInitStatics( UINT usWinNum, LPCTSTR lpszWinName, USHORT usRow1, USHORT usCol1, USHORT usRow2, USHORT usCol2 ) { @@ -5200,7 +5200,7 @@ static void hb_gtInitStatics( UINT usWinNum, LPCTSTR lpszWinName, USHORT usRow1, s_pWvwData->s_usCurWindow = usWinNum; } -/*-------------------------------------------------------------------*/ + /* * functions for handling the input queues for the mouse and keyboard */ @@ -5225,35 +5225,35 @@ static void hb_gt_wvwAddCharToInputQueue ( int iKey ) } -/*-------------------------------------------------------------------*/ + USHORT hb_gt_wvwGetMouseX ( WIN_DATA * pWindowData ) { return( (SHORT) pWindowData->mousePos.x ); } -/*-------------------------------------------------------------------*/ + USHORT hb_gt_wvwGetMouseY ( WIN_DATA * pWindowData ) { return( (SHORT) pWindowData->mousePos.y ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwSetMouseX ( WIN_DATA * pWindowData, USHORT ix ) { pWindowData->mousePos.x = ix; } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwSetMouseY ( WIN_DATA * pWindowData, USHORT iy ) { pWindowData->mousePos.y = iy; } -/*-------------------------------------------------------------------*/ + /* * hb_gt_wvwSetStringInTextBuffer puts the string of the specified length into the TextBuffer at * the specified caret position @@ -5282,7 +5282,7 @@ static void hb_gt_wvwSetStringInTextBuffer( WIN_DATA * pWindowData, int col, int } } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwSetCaretOn( WIN_DATA * pWindowData, BOOL bOn ) { @@ -5303,7 +5303,7 @@ static void hb_gt_wvwSetCaretOn( WIN_DATA * pWindowData, BOOL bOn ) s_pWvwData->s_sApp->displayCaret = bOn; } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwHandleMenuSelection( int menuIndex ) { @@ -5311,7 +5311,7 @@ static void hb_gt_wvwHandleMenuSelection( int menuIndex ) hb_gt_wvwAddCharToInputQueue( s_pWvwData->s_pWindows[ s_pWvwData->s_usNumWindows-1 ]->MenuKeyEvent ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwMouseEvent( WIN_DATA * pWindowData, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -6236,18 +6236,18 @@ static UINT hb_gt_wvwSetCurWindow( UINT usWinNum ) return(usOldWin); } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Supporters of HB_GT_FUNC(...) */ /* DONE: These all are to be made window selective! */ /* all row and col are relative to its own window! */ /* Budyanto Dj. */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* NOTE:works for topmost window only */ static void hb_wvw_vmouse_Init( void ) { @@ -6799,21 +6799,21 @@ static void hb_gt_wvw_vSetPos( WIN_DATA * pWindowData, int iRow, int iCol ) } } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Other static functions */ /* Budyanto Dj. */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + + /*hb_wvw_InitPendingRect( ) is called during init static, or after userpaint */ /*This function must be called only when bPaintPending == FALSE */ -/*-------------------------------------------------------------------*/ + static void hb_wvw_InitPendingRect( WIN_DATA * pWindowData ) { @@ -6823,10 +6823,10 @@ static void hb_wvw_InitPendingRect( WIN_DATA * pWindowData ) pWindowData->rPaintPending.bottom = 0; } -/*-------------------------------------------------------------------*/ + /*hb_wvw_UpdatePendingRect( ) is called by hb_gt_wvwWndProc() */ /*This function's job is to update paint pending rect */ -/*-------------------------------------------------------------------*/ + static void hb_wvw_UpdatePendingRect( WIN_DATA * pWindowData, USHORT usRow1, USHORT usCol1, USHORT usRow2, USHORT usCol2 ) { pWindowData->rPaintPending.left = HB_MIN( pWindowData->rPaintPending.left, usCol1 ); @@ -6879,16 +6879,16 @@ static void hb_gt_wvwFillLineSpace( WIN_DATA * pWindowData, HDC hdc, USHORT star DeleteObject( hBrush ); } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Exported functions for API calls */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + BOOL hb_gt_wvwSetMenuKeyEvent( UINT usWinNum, int iMenuKeyEvent ) { @@ -6902,7 +6902,7 @@ BOOL hb_gt_wvwSetMenuKeyEvent( UINT usWinNum, int iMenuKeyEvent ) return( iOldEvent ); } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvwSetCentreWindow( UINT usWinNum, BOOL bCentre, BOOL bPaint ) { @@ -6928,14 +6928,14 @@ static BOOL hb_gt_wvwSetCentreWindow( UINT usWinNum, BOOL bCentre, BOOL bPaint ) return( bWasCentre ); } -/*-------------------------------------------------------------------*/ + void hb_gt_wvwResetWindow( UINT usWinNum ) { hb_gt_wvwResetWindowSize( s_pWvwData->s_pWindows[ usWinNum ], s_pWvwData->s_pWindows[usWinNum]->hWnd ) ; } -/*-------------------------------------------------------------------*/ + static BOOL hb_gt_wvwSetCodePage( UINT usWinNum, int iCodePage ) { @@ -6953,14 +6953,14 @@ static BOOL hb_gt_wvwSetCodePage( UINT usWinNum, int iCodePage ) return( iOldCodePage ); } -/*-------------------------------------------------------------------*/ + int hb_gt_wvwGetLastMenuEvent( UINT usWinNum ) { return( s_pWvwData->s_pWindows[usWinNum]->LastMenuEvent ); } -/*-------------------------------------------------------------------*/ + int hb_gt_wvwSetLastMenuEvent( UINT usWinNum, int iLastMenuEvent ) { @@ -6969,7 +6969,7 @@ int hb_gt_wvwSetLastMenuEvent( UINT usWinNum, int iLastMenuEvent ) return( iRetval ); } -/*-------------------------------------------------------------------*/ + static void hb_gt_wvwSetWindowTitle( UINT usWinNum, const char * title ) { @@ -6998,7 +6998,7 @@ static BOOL hb_gt_wvw_GetWindowTitle( UINT usWinNum, char ** title ) return FALSE; } -/*-------------------------------------------------------------------*/ + //static DWORD hb_gt_wvwSetWindowIcon( UINT usWinNum, int icon, char *lpIconName ) static HICON hb_gt_wvwSetWindowIcon( UINT usWinNum, int icon, const char *lpIconName ) @@ -7025,7 +7025,7 @@ static HICON hb_gt_wvwSetWindowIcon( UINT usWinNum, int icon, const char *lpIcon return( hIcon ) ; } -/*-------------------------------------------------------------------*/ + //static DWORD hb_gt_wvwSetWindowIconFromFile( UINT usWinNum, char *icon ) static HICON hb_gt_wvwSetWindowIconFromFile( UINT usWinNum, const char *icon ) @@ -7043,14 +7043,14 @@ static HICON hb_gt_wvwSetWindowIconFromFile( UINT usWinNum, const char *icon ) return( hIcon ) ; } -/*-------------------------------------------------------------------*/ + int hb_gt_wvwGetWindowTitle( UINT usWinNum, char * title, int length ) { return( GetWindowText( s_pWvwData->s_pWindows[usWinNum]->hWnd, title, length ) ); } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwSetFont( UINT usWinNum, const char * fontFace, int height, int width, int Bold, int Quality ) { @@ -7104,21 +7104,21 @@ BOOL hb_gt_wvwSetFont( UINT usWinNum, const char * fontFace, int height, int wid return( bResult ); } -/*-------------------------------------------------------------------*/ + HWND hb_gt_wvwGetWindowHandle( UINT usWinNum ) { return( s_pWvwData->s_pWindows[usWinNum]->hWnd ); } -/*-------------------------------------------------------------------*/ + void hb_gt_wvwPostMessage( UINT usWinNum, int message ) { SendMessage( s_pWvwData->s_pWindows[usWinNum]->hWnd, WM_CHAR,message, 0 ); } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwSetWindowPos( UINT usWinNum, int left, int top ) { @@ -7128,7 +7128,7 @@ BOOL hb_gt_wvwSetWindowPos( UINT usWinNum, int left, int top ) return( SetWindowPos( s_pWvwData->s_pWindows[usWinNum]->hWnd, NULL, left, top, ( wi.right-wi.left )+1, ( wi.bottom-wi.top )+1, SWP_NOZORDER ) ); } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwSetAltF4Close( BOOL bCanClose ) { @@ -7139,7 +7139,7 @@ BOOL hb_gt_wvwSetAltF4Close( BOOL bCanClose ) return( bWas ); } -/*-------------------------------------------------------------------*/ + void hb_gt_wvwDoProcessMessages( UINT usWinNum ) { @@ -7147,7 +7147,7 @@ void hb_gt_wvwDoProcessMessages( UINT usWinNum ) hb_gt_wvwProcessMessages( s_pWvwData->s_pWindows[ usWinNum ] ); } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwSetMouseMove( UINT usWinNum, BOOL bHandleEvent ) { @@ -7156,7 +7156,7 @@ BOOL hb_gt_wvwSetMouseMove( UINT usWinNum, BOOL bHandleEvent ) return( bWas ); } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwEnableShortCuts( UINT usWinNum, BOOL bEnable ) { @@ -7401,7 +7401,7 @@ BOOL hb_gt_wvwDrawImage( UINT usWinNum, int x1, int y1, int wd, int ht, const ch return( bResult ); } -/*-------------------------------------------------------------------*/ + IPicture * hb_gt_wvwLoadPicture( const char * image ) { @@ -7440,7 +7440,7 @@ IPicture * hb_gt_wvwLoadPicture( const char * image ) return ( IPicture * ) iPicture; } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwRenderPicture( UINT usWinNum, int x1, int y1, int wd, int ht, IPicture * iPicture, BOOL bTransp ) { @@ -7538,21 +7538,21 @@ BOOL hb_gt_wvwRenderPicture( UINT usWinNum, int x1, int y1, int wd, int ht, IPic return( bResult ); } -/*-------------------------------------------------------------------*/ + WIN_DATA * hb_gt_wvwGetGlobalData( UINT usWinNum ) { return s_pWvwData->s_pWindows[ usWinNum ]; } -/*-------------------------------------------------------------------*/ + COLORREF hb_gt_wvwGetColorData( int iIndex ) { return _COLORS[ iIndex ]; } -/*-------------------------------------------------------------------*/ + BOOL hb_gt_wvwSetColorData( int iIndex, COLORREF ulCr ) { @@ -7566,7 +7566,7 @@ BOOL hb_gt_wvwSetColorData( int iIndex, COLORREF ulCr ) return bResult; } -/*-------------------------------------------------------------------*/ + /* difference with gtwvt's: @@ -7634,7 +7634,7 @@ void hb_gt_wvwDrawBoxRaised( UINT usWinNum, int iTop, int iLeft, int iBottom, in } -/*-------------------------------------------------------------------*/ + /* difference with gtwvt's: @@ -7696,7 +7696,7 @@ void hb_gt_wvwDrawBoxRecessed( UINT usWinNum, int iTop, int iLeft, int iBottom, } -/*-------------------------------------------------------------------*/ + void hb_gt_wvwDrawOutline( UINT usWinNum, int iTop, int iLeft, int iBottom, int iRight ) { @@ -7819,16 +7819,16 @@ WVW_DATA * hb_getWvwData( void ) { return s_pWvwData; } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Window Related xHarbour callable functions */ /* Budyanto Dj. */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /*20040713 this function was named WVW_lOpenWindow() *now it is wvw_nOpenWindow() @@ -8470,16 +8470,16 @@ HB_FUNC( WVW_ENABLEMAXIMIZE ) } } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* GTWVW parameter setting from .prg */ /* Budyanto Dj. */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /*WVW_SetPaintRefresh( [nPaintRefresh] ) *returns old setting of s_pWvwData->s_uiPaintRefresh (millisec between calls to WVW_PAINT) @@ -8778,21 +8778,21 @@ HB_FUNC( WVW_NOSTARTUPSUBWINDOW ) -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETSCREENWIDTH ) { hb_retni( GetSystemMetrics( SM_CXSCREEN ) ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETSCREENHEIGHT ) { hb_retni( GetSystemMetrics( SM_CYSCREEN ) ); } -/*-------------------------------------------------------------------*/ + /*WVW_SetWindowCentre( nWinNum, (0==MAIN) * lCentre, @@ -8804,7 +8804,7 @@ HB_FUNC( WVW_SETWINDOWCENTRE ) hb_gt_wvwSetCentreWindow( usWinNum, hb_parl( 2 ), hb_parl( 3 ) ) ; } -/*-------------------------------------------------------------------*/ + /*WVW_EnableShortCuts( nWinNum, lEnable ) * lEnable defaults to .t. @@ -8819,14 +8819,14 @@ HB_FUNC( WVW_ENABLESHORTCUTS ) hb_retl( hb_gt_wvwEnableShortCuts( usWinNum, bEnable ) ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_SETALTF4CLOSE ) { hb_retl( hb_gt_wvwSetAltF4Close( hb_parl( 1 ) ) ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_PROCESSMESSAGES ) { @@ -8836,7 +8836,7 @@ HB_FUNC( WVW_PROCESSMESSAGES ) hb_retl( 1 ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETTITLE ) { @@ -8848,9 +8848,9 @@ HB_FUNC( WVW_GETTITLE ) hb_retc( ( char* ) ucText ) ; } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Author.....: Francesco Saverio Giudice */ /* Syntax.....: Wvw_GetRGBColor( nColor ) --> nRGBColor */ @@ -8860,9 +8860,9 @@ HB_FUNC( WVW_GETTITLE ) /* Creat. Date: 2004/01/15 */ /* Last Modif.: 2004/01/15 */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + HB_FUNC( WVW_GETRGBCOLOR ) { @@ -8879,19 +8879,19 @@ HB_FUNC( WVW_GETRGBCOLOR ) } } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Giancarlo Niccolai */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + + /* Clipboard functions */ -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETCLIPBOARD ) { @@ -8921,7 +8921,7 @@ HB_FUNC( WVW_GETCLIPBOARD ) CloseClipboard(); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_SETCLIPBOARD ) { @@ -8981,7 +8981,7 @@ HB_FUNC( WVW_SETCLIPBOARD ) hb_retl( TRUE ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_PASTEFROMCLIPBOARD ) { @@ -9024,13 +9024,13 @@ HB_FUNC( WVW_KEYBOARD ) hb_gt_wvwAddCharToInputQueue( hb_parnl( 1 ) ); } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + /* End of Clipboard Functions */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + HB_FUNC( WVW_INVALIDATERECT ) { @@ -9059,14 +9059,14 @@ HB_FUNC( WVW_INVALIDATERECT ) InvalidateRect( pWindowData->hWnd, &rc, TRUE ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_ISLBUTTONPRESSED ) { hb_retl( GetKeyState( VK_LBUTTON ) & 0x8000 ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_CLIENTTOSCREEN ) { @@ -9092,15 +9092,15 @@ HB_FUNC( WVW_CLIENTTOSCREEN ) hb_itemReturnRelease( paXY ); } -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + /* */ /* Pritpal Bedi */ /* */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + + HB_FUNC( WVW_SETFONT ) { @@ -9114,7 +9114,7 @@ HB_FUNC( WVW_SETFONT ) ) ) ; } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_SETICON ) { @@ -9131,7 +9131,7 @@ HB_FUNC( WVW_SETICON ) } } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_SETTITLE ) { @@ -9140,7 +9140,7 @@ HB_FUNC( WVW_SETTITLE ) return ; } -/*-------------------------------------------------------------------*/ + /* WVW_SetWindowPos( nWinNum, nXposition, nYposition) (position in pixel) */ HB_FUNC( WVW_SETWINDOWPOS ) @@ -9149,7 +9149,7 @@ HB_FUNC( WVW_SETWINDOWPOS ) hb_gt_wvwSetWindowPos( usWinNum, hb_parni( 2 ), hb_parni( 3 ) ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETWINDOWHANDLE ) { @@ -9157,7 +9157,7 @@ HB_FUNC( WVW_GETWINDOWHANDLE ) hb_retnl( ( LONG ) hb_gt_wvwGetWindowHandle( usWinNum ) ) ; } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_SETCODEPAGE ) { @@ -9165,7 +9165,7 @@ HB_FUNC( WVW_SETCODEPAGE ) hb_retni( hb_gt_wvwSetCodePage( usWinNum, hb_parni( 2 ) ) ); } -/*-------------------------------------------------------------------*/ + /* WVW_CenterWindow( nWinNum, lCenter, lPaint ) (nWinNum==0==MAIN) */ HB_FUNC( WVW_CENTERWINDOW ) @@ -9177,7 +9177,7 @@ HB_FUNC( WVW_CENTERWINDOW ) HB_ISNIL( 3 ) ? FALSE : hb_parl( 3 ) ) ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_SETMOUSEMOVE ) { @@ -9192,7 +9192,7 @@ HB_FUNC( WVW_SETMOUSEMOVE ) } } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETXYFROMROWCOL ) { @@ -9208,7 +9208,7 @@ HB_FUNC( WVW_GETXYFROMROWCOL ) hb_itemReturnRelease( paXY ); } -/*-------------------------------------------------------------------*/ + /* WVW_GetRowColFromXY( [nWinNum], nX, nY ) * return an array {nRow, nCol} @@ -9227,7 +9227,7 @@ HB_FUNC( WVW_GETROWCOLFROMXY ) hb_itemReturnRelease( paRowCol ); } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETFONTINFO ) { @@ -9246,7 +9246,7 @@ HB_FUNC( WVW_GETFONTINFO ) } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_GETPALETTE ) { @@ -9260,7 +9260,7 @@ HB_FUNC( WVW_GETPALETTE ) } -/*-------------------------------------------------------------------*/ + /* */ /* Wvw_SetPalette( aRGBValues ) -> An array of 16 elements with RGB values */ /* */ @@ -9274,7 +9274,7 @@ HB_FUNC( WVW_SETPALETTE ) } } -/*-------------------------------------------------------------------*/ + HB_FUNC( WVW_MINIMIZE ) { @@ -9282,7 +9282,7 @@ HB_FUNC( WVW_MINIMIZE ) ShowWindow( s_pWvwData->s_pWindows[usWinNum]->hWnd, SW_MINIMIZE ); } -/*-------------------------------------------------------------------*/ + /* wvw_maximize( [nWinNum] ) maximizes the window, if callback function WVW_SIZE exists @@ -9337,7 +9337,7 @@ HB_FUNC( WVW_RESTORE ) */ -/*-------------------------------------------------------------------*/ + /* NOTE: this is not supported in GTWVW HB_FUNC( WVW_SETGUI ) @@ -9353,15 +9353,7 @@ HB_FUNC( WVW_SETGUI ) } */ - - -/*-------------------------------------------------------------------*/ - - -/*-------------------------------------------------------------------*/ - - -/*------------------------------------------------------------------- +/* * * Helper routine. Take an input pointer, return closest * pointer that is aligned on a DWORD (4 byte) boundary. @@ -9497,9 +9489,9 @@ IPicture * rr_LoadPicture( const char * filename, LONG * lwidth, LONG * lheight -/*-------------------------------------------------------------------*/ + /* Supporting functions */ -/*-------------------------------------------------------------------*/ + static BITMAPINFO * PackedDibLoad (PTSTR szFileName) { @@ -10205,15 +10197,15 @@ LRESULT CALLBACK hb_gt_wvwTBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM return( CallWindowProc( (WNDPROC) pWindowData->tbOldProc, hWnd, message, wParam, lParam ) ); } -/*-------------------------------------------------------------------*/ + /* .prg callable functions */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------*/ + + /* SCROLLBAR begins */ -/*-------------------------------------------------------------------*/ + /*********************** start control (eg. scrollbar) list handler ***************************/ @@ -10616,9 +10608,9 @@ static void ReposControls(UINT usWinNum, BYTE byCtrlClass) /*********************** end control (eg. scrollbar) list handler ***************************/ -/*-------------------------------------------------------------------*/ + /* SCROLLBAR begins */ -/*-------------------------------------------------------------------*/ + LRESULT CALLBACK hb_gt_wvwXBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -10716,9 +10708,9 @@ LRESULT CALLBACK hb_gt_wvwXBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM } -/*-------------------------------------------------------------------*/ + /* PUSHBUTTON begins */ -/*-------------------------------------------------------------------*/ + LRESULT CALLBACK hb_gt_wvwBtnProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -11237,9 +11229,9 @@ LRESULT CALLBACK hb_gt_wvwCBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM } -/*-------------------------------------------------------------------*/ + /* EDITBOX begins (experimental) */ -/*-------------------------------------------------------------------*/ + LRESULT CALLBACK hb_gt_wvwEBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { @@ -11715,19 +11707,15 @@ LRESULT CALLBACK hb_gt_wvwEBProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM -/*-------------------------------------------------------------------*/ -/* EDITBOX ends (experimental) */ -/*-------------------------------------------------------------------*/ -/*-------------------------------------------------------------------* - *-------------------------------------------------------------------* - *-------------------------------------------------------------------* +/* EDITBOX ends (experimental) */ + + +/* * * Direct WinApi Functions - Prefixed WIN_*() * Original work of Pritpal Bedi on wvtutils.c * *TODO: should be moved to separate modul. totally independent of GT. * - *-------------------------------------------------------------------* - *-------------------------------------------------------------------* - *-------------------------------------------------------------------*/ + */ diff --git a/harbour/extras/gtwvw/hbgtwvw.h b/harbour/extras/gtwvw/hbgtwvw.h index ffd78c7e35..c23fab65d1 100644 --- a/harbour/extras/gtwvw/hbgtwvw.h +++ b/harbour/extras/gtwvw/hbgtwvw.h @@ -77,18 +77,12 @@ #define _WIN32_IE 0x0400 #endif -/*-------------------------------------------------------------------*/ - /* NOTE: User programs should never call this layer directly! */ /* This definition has to be placed before #include "hbapigt.h" */ -/*-------------------------------------------------------------------*/ - #define HB_GT_NAME WVW -/*-------------------------------------------------------------------*/ - #ifndef CINTERFACE #define CINTERFACE 1 #endif @@ -156,8 +150,6 @@ #include #include -/*-------------------------------------------------------------------*/ - /* xHarbour compatible definitions */ #if !defined( K_SH_LEFT ) #define K_SH_LEFT K_LEFT /* Shift-Left == Left */ @@ -246,7 +238,6 @@ //#define WVW_WHICH_WINDOW ( HB_ISNIL( 1 ) ? ( s_bMainCoordMode ? s_usNumWindows-1 : s_usCurWindow ) : ((UINT) hb_parni( 1 )) ) #define WVW_WHICH_WINDOW ( HB_ISNIL( 1 ) ? ( hb_gt_wvw_GetMainCoordMode() ? ((hb_gt_wvw_GetNumWindows())-1) : hb_gt_wvw_GetCurWindow() ) : ((UINT) hb_parni( 1 )) ) -/*-------------------------------------------------------------------*/ #define BLACK RGB( 0x0 ,0x0 ,0x0 ) #define BLUE RGB( 0x0 ,0x0 ,0x85 ) @@ -265,8 +256,6 @@ #define YELLOW RGB( 0xFF,0xFF,0x00 ) #define BRIGHT_WHITE RGB( 0xFF,0xFF,0xFF ) -/*-------------------------------------------------------------------*/ - #if defined(__DMC__) #define SBT_TOOLTIPS 0x0800 @@ -322,7 +311,6 @@ ULONG LowerRight; } GRADIENT_RECT,*PGRADIENT_RECT,*LPGRADIENT_RECT; #endif -/*-------------------------------------------------------------------*/ #define WM_MY_UPDATE_CARET ( WM_USER + 0x0101 ) @@ -334,8 +322,6 @@ typedef BOOL ( WINAPI *wvwGradientFill ) ( ULONG dwNumMesh, ULONG dwMode ); -/*-------------------------------------------------------------------*/ - #ifndef _MAX_PATH #define _MAX_PATH 256 #endif @@ -356,8 +342,6 @@ typedef struct picture_handle struct picture_handle * pNext; } PICTURE_HANDLE; -/*-------------------------------------------------------------------*/ - #define WVW_CONTROL_SCROLLBAR 1 #define WVW_CONTROL_PUSHBUTTON 2 #define WVW_CONTROL_CHECKBOX 2 @@ -390,8 +374,6 @@ typedef struct control_data struct control_data * pNext; } CONTROL_DATA; -/*-------------------------------------------------------------------*/ - typedef struct app_data { BOOL CaretExist; /* TRUE if a caret has been created */ diff --git a/harbour/extras/gtwvw/tests/cbtest1.prg b/harbour/extras/gtwvw/tests/cbtest1.prg index 01005b3777..c72d7a40c4 100644 --- a/harbour/extras/gtwvw/tests/cbtest1.prg +++ b/harbour/extras/gtwvw/tests/cbtest1.prg @@ -26,7 +26,7 @@ static s_aAnswers := {"1-GTWVW is a great library!",; static s_cYourAnswer:="Your response is:" static s_cThankYou := "Thanks for participating in our survey :-)" -#DEFINE _SECRET_KEY 101010 +#define _SECRET_KEY 101010 ANNOUNCE HB_NOSTARTUPWINDOW @@ -43,7 +43,7 @@ local ch,ncursor WVW_pbSetFont(NIL, "Arial", 16) nMaxWidth := 0 - aeval(s_aAnswers, {|x| nMaxWIdth := max(nMaxWidth,len(x))}) + aeval(s_aAnswers, {| x | nMaxWIdth := max(nMaxWidth,len(x))}) setmode(11, nMaxWidth+1+10+2) @@ -52,11 +52,11 @@ local ch,ncursor @ 1,1 say s_cQuestion @ 2,1 say s_cHint nCBid := wvw_cbCreate(NIL, 4, 1, nMaxWidth, s_aAnswers, ; - {|nWinNum,nId,nEvent,nIndex| ; - CBhandler(nWinNum,nId,nEvent,nIndex, nPBid)}) + {| nWinNum, nId, nEvent, nIndex | ; + CBhandler( nWinNum, nId, nEvent, nIndex, nPBid ) } ) nPBid := wvw_pbCreate(NIL, 4,1+nMaxWidth+1, 4,1+nMaxWidth+1+10-1, "OK",NIL,; - {||__keyboard(_SECRET_KEY)},{0,0,+2,0}) + {|| __keyboard( _SECRET_KEY ) },{0,0,+2,0}) wvw_cbSetFocus(NIL, nCBid) diff --git a/harbour/extras/gtwvw/tests/cbtest6.prg b/harbour/extras/gtwvw/tests/cbtest6.prg index d52cd59bc6..89e0514f98 100644 --- a/harbour/extras/gtwvw/tests/cbtest6.prg +++ b/harbour/extras/gtwvw/tests/cbtest6.prg @@ -40,7 +40,7 @@ MEMVAR __nCBid__,__temp__ ; __nCBid__ := wvw_cbCreate(NIL, , , , ; , ; - {|nWinNum,nId,nEvent,nIndex, temp| ; + {| nWinNum, nId, nEvent, nIndex, temp | ; CBhandler(nWinNum,nId,nEvent,nIndex,<"var">,GetList); }, ; NIL,NIL,s_nCB_Kbd,NIL); ; @@ -48,9 +48,9 @@ MEMVAR __nCBid__,__temp__ __temp__ := wvw_cbFindString(NIL, __nCBid__, ); ; iif(__temp__>=0, wvw_cbSetIndex(NIL, __nCBid__, __temp__),NIL); ; setpos(,); ; - AAdd(GetList,_GET_(,<"var">,repl("X",),,) ) ; ; + AAdd(GetList,_GET_(,<"var">,Replicate("X",),,) ) ; ; ATAIL(GetList):cargo := __nCBid__; ; - ATAIL(GetList):reader := {|get| CBreader(get)} + ATAIL(GetList):reader := {| get | CBreader(get)} proc main local getlist := {} @@ -78,7 +78,7 @@ local __nCBid__,__temp__ //these two are temporary var required by CB get creat read * disable all comboboxes: - aeval(s_aComboList, {|x| wvw_cbenable(NIL, x[1], .f.)}) + aeval(s_aComboList, {| x | wvw_cbenable(NIL, x[1], .f.)}) devpos(5,0) ? "name: '" + mname + "'" @@ -89,7 +89,7 @@ local __nCBid__,__temp__ //these two are temporary var required by CB get creat inkey(0) * destroy all comboboxes: - aeval(s_aComboList, {|x| wvw_cbdestroy(NIL, x[1])}) + aeval(s_aComboList, {| x | wvw_cbdestroy(NIL, x[1])}) s_aComboList := {} ? @@ -134,7 +134,7 @@ local oGet := GetActive() do case case nEvent==3 //CBN_SETFOCUS - i := ascan(GetList, {|x|x:Name==cVar}) + i := ascan(GetList, {| x | x:Name == cVar } ) if i>0 /* !oGet:HasFocus means * CBN_SETFOCUS was NOT initiated from mouseclick diff --git a/harbour/extras/gtwvw/tests/drawimg.prg b/harbour/extras/gtwvw/tests/drawimg.prg index ff7905e86c..40a489e8b5 100644 --- a/harbour/extras/gtwvw/tests/drawimg.prg +++ b/harbour/extras/gtwvw/tests/drawimg.prg @@ -94,15 +94,15 @@ local getlist := {} @ 0,0 say "FileName :" get cpict pict "@K" valid file(alltrim(cpict)) @ 1,0 say "Transpar? :" get ltransp pict "Y" @ 2,0 say "Max Cache :" get nMaxCache pict "999" - @ 3,0 say "NumOfCache=" + trans(wvw_numBMcache(),"999") +; - ", Max NumOfCache=" + trans(wvw_SetMaxBMcache(),"999") + @ 3,0 say "NumOfCache=" + transform(wvw_numBMcache(),"999") +; + ", Max NumOfCache=" + transform(wvw_SetMaxBMcache(),"999") read if lastkey()==27 exit endif wvw_SetMaxBMcache(nMaxCache) - @ 3,0 say "NumOfCache=" + trans(wvw_numBMcache(),"999") +; - ", Max NumOfCache=" + trans(wvw_SetMaxBMcache(),"999") + @ 3,0 say "NumOfCache=" + transform(wvw_numBMcache(),"999") +; + ", Max NumOfCache=" + transform(wvw_SetMaxBMcache(),"999") @ 5,0 say "TOPLEFT: stretched image TOPRIGHT: fit vertically (proportional)" @ 6,0 say "BOTLEFT: fit horizontally (proportional) BOTRIGHT: actual image size" @@ -294,7 +294,7 @@ local nLen, aRect //20050720 * ... * exist nType + cId ? - i := ASCAN(s_aPObjList[ nWinNum+1 ], {|x| x:nType==oWPaint:nType .and. x:cId==oWPaint:cId}) + i := ASCAN(s_aPObjList[ nWinNum+1 ], {| x | x:nType==oWPaint:nType .and. x:cId==oWPaint:cId}) if i > 0 * so we are about to overwrite now... diff --git a/harbour/extras/gtwvw/tests/ebtest7.prg b/harbour/extras/gtwvw/tests/ebtest7.prg index 6d782232cf..0b06b2dd82 100644 --- a/harbour/extras/gtwvw/tests/ebtest7.prg +++ b/harbour/extras/gtwvw/tests/ebtest7.prg @@ -32,7 +32,7 @@ [] ; [PICTURE ] ; ; - => AddEBGet(aEBGets, , , @, <"var">, {|x| := x},