From a25d1508fba90d5011f4405b9c462fa346cbd21d Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Fri, 9 Nov 2012 23:54:52 +0000 Subject: [PATCH] 2012-11-09 15:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * 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/hbgtwvg.ch * 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/toolbar.prg * contrib/gtwvg/treeview.prg * contrib/gtwvg/wnd.prg * contrib/gtwvg/wvgcore.c * contrib/gtwvg/wvgcuig.c * contrib/gtwvg/wvgparts.ch * contrib/gtwvg/wvgutils.c * contrib/gtwvg/wvgwin.c * contrib/gtwvg/wvgwing.c ! Formatting: removed few hbformt applied residuals. ! Bumped: copyright years. ! Changed: => --- harbour/ChangeLog | 40 +++ harbour/contrib/gtwvg/3state.prg | 28 +- harbour/contrib/gtwvg/activex.prg | 54 +--- harbour/contrib/gtwvg/bitmap.prg | 22 +- harbour/contrib/gtwvg/checkbox.prg | 26 +- harbour/contrib/gtwvg/class.prg | 416 +---------------------------- harbour/contrib/gtwvg/combobox.prg | 39 +-- harbour/contrib/gtwvg/crt.prg | 164 +----------- harbour/contrib/gtwvg/dataref.prg | 24 +- harbour/contrib/gtwvg/dialog.prg | 35 +-- harbour/contrib/gtwvg/drawarea.prg | 22 +- harbour/contrib/gtwvg/genrc.prg | 16 -- harbour/contrib/gtwvg/hbgtwvg.ch | 2 +- harbour/contrib/gtwvg/htmlview.prg | 60 ++--- harbour/contrib/gtwvg/listbox.prg | 24 +- harbour/contrib/gtwvg/menubar.prg | 83 +----- harbour/contrib/gtwvg/mle.prg | 38 +-- harbour/contrib/gtwvg/paint.prg | 147 ++-------- harbour/contrib/gtwvg/parthdlr.prg | 49 +--- harbour/contrib/gtwvg/pushbut.prg | 28 +- harbour/contrib/gtwvg/radiobut.prg | 32 +-- harbour/contrib/gtwvg/scrollbr.prg | 26 +- harbour/contrib/gtwvg/sle.prg | 28 -- harbour/contrib/gtwvg/statbar.prg | 55 +--- harbour/contrib/gtwvg/static.prg | 26 +- harbour/contrib/gtwvg/syswnd.prg | 74 +---- harbour/contrib/gtwvg/tabpage.prg | 34 +-- harbour/contrib/gtwvg/toolbar.prg | 61 +---- harbour/contrib/gtwvg/treeview.prg | 64 +---- harbour/contrib/gtwvg/wnd.prg | 182 +------------ harbour/contrib/gtwvg/wvgcore.c | 4 +- harbour/contrib/gtwvg/wvgcuig.c | 4 +- harbour/contrib/gtwvg/wvgparts.ch | 2 +- harbour/contrib/gtwvg/wvgutils.c | 4 +- harbour/contrib/gtwvg/wvgwin.c | 2 +- harbour/contrib/gtwvg/wvgwing.c | 2 +- 36 files changed, 142 insertions(+), 1775 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 19de5e080c..730c999c1c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,46 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-09 15:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * 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/hbgtwvg.ch + * 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/toolbar.prg + * contrib/gtwvg/treeview.prg + * contrib/gtwvg/wnd.prg + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgcuig.c + * contrib/gtwvg/wvgparts.ch + * contrib/gtwvg/wvgutils.c + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgwing.c + ! Formatting: removed few hbformt applied residuals. + ! Bumped: copyright years. + ! Changed: => + 2012-11-10 00:17 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbexpat/core.c * contrib/hbexpat/internal.c diff --git a/harbour/contrib/gtwvg/3state.prg b/harbour/contrib/gtwvg/3state.prg index dfb056f7fa..be7221eb56 100644 --- a/harbour/contrib/gtwvg/3state.prg +++ b/harbour/contrib/gtwvg/3state.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbp3State Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 07Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,14 +68,10 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -// - CREATE CLASS Wvg3State INHERIT WvgWindow, WvgDataRef VAR autosize INIT .F. @@ -103,8 +93,6 @@ CREATE CLASS Wvg3State INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD Wvg3State:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -115,8 +103,6 @@ METHOD Wvg3State:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD Wvg3State:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -145,8 +131,6 @@ METHOD Wvg3State:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD Wvg3State:handleEvent( nMessage, aNM ) hb_traceLog( " %s:handleEvent( %i )", __objGetClsName( self ), nMessage ) @@ -179,8 +163,6 @@ METHOD Wvg3State:handleEvent( nMessage, aNM ) RETURN 1 -// - METHOD Wvg3State:destroy() hb_traceLog( " %s:destroy()", __objGetClsName() ) @@ -189,16 +171,12 @@ METHOD Wvg3State:destroy() RETURN NIL -// - METHOD Wvg3State:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD Wvg3State:setCaption( xCaption ) IF HB_ISSTRING( xCaption ) @@ -207,5 +185,3 @@ METHOD Wvg3State:setCaption( xCaption ) ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/activex.prg b/harbour/contrib/gtwvg/activex.prg index 0cc2bee5be..731bd9c6e7 100644 --- a/harbour/contrib/gtwvg/activex.prg +++ b/harbour/contrib/gtwvg/activex.prg @@ -7,7 +7,7 @@ * Source file for the Wvg*Classes * * Copyright 2008 Andy Wos - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -51,21 +51,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ Compatible xbpActiveXControl Class * - * Pritpal Bedi + * Pritpal Bedi * 08Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -75,14 +69,10 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -// - CREATE CLASS WvgActiveXControl FROM WvgWindow VAR oOLE @@ -127,8 +117,6 @@ CREATE CLASS WvgActiveXControl FROM WvgWindow ENDCLASS -// - METHOD WvgActiveXControl:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -140,8 +128,6 @@ 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 @@ -201,8 +187,6 @@ METHOD WvgActiveXControl:Create( oParent, oOwner, aPos, aSize, aPresParams, lVis RETURN Self -// - PROCEDURE execEvent( nEvent, ... ) CLASS WvgActiveXControl #if 0 @@ -220,8 +204,6 @@ PROCEDURE execEvent( nEvent, ... ) CLASS WvgActiveXControl RETURN -// - METHOD WvgActiveXControl:handleEvent( nEvent, aNM ) LOCAL nHandled := 0 @@ -246,8 +228,6 @@ METHOD WvgActiveXControl:handleEvent( nEvent, aNM ) RETURN nHandled -// - METHOD WvgActiveXControl:OnError() #if 0 @@ -257,8 +237,6 @@ METHOD WvgActiveXControl:OnError() RETURN hb_ExecFromArray( ::oOLE, __GetMessage(), hb_AParams() ) -// - METHOD WvgActiveXControl:Destroy() IF ! Empty( ::oOLE:__hObj ) @@ -271,8 +249,6 @@ METHOD WvgActiveXControl:Destroy() RETURN NIL -// - METHOD WvgActiveXControl:mapEvent( nEvent, bBlock ) IF HB_ISNUMERIC( nEvent ) .AND. HB_ISBLOCK( bBlock ) @@ -281,78 +257,52 @@ 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 f250947860..6841e4b537 100644 --- a/harbour/contrib/gtwvg/bitmap.prg +++ b/harbour/contrib/gtwvg/bitmap.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpBitmap compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 06Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,14 +68,10 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - #ifndef __DBG_PARTS__ #xtranslate hb_traceLog( [] ) => #endif -// - CREATE CLASS WvgBitmap VAR bits INIT 0 READONLY @@ -114,14 +104,10 @@ CREATE CLASS WvgBitmap ENDCLASS -// - METHOD new() CLASS WvgBitmap RETURN Self -// - METHOD create( oPScompat ) CLASS WvgBitmap IF oPScompat == NIL @@ -133,8 +119,6 @@ METHOD create( oPScompat ) CLASS WvgBitmap RETURN Self -// - METHOD destroy() CLASS WvgBitmap IF ::hBitmap != nil @@ -145,5 +129,3 @@ METHOD destroy() CLASS WvgBitmap ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/checkbox.prg b/harbour/contrib/gtwvg/checkbox.prg index b006eaa3fd..5c1bbbcedb 100644 --- a/harbour/contrib/gtwvg/checkbox.prg +++ b/harbour/contrib/gtwvg/checkbox.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpPushButton Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 05Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef VAR autosize INIT .F. @@ -101,8 +93,6 @@ CREATE CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD WvgCheckBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -113,8 +103,6 @@ METHOD WvgCheckBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgCheckBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -140,8 +128,6 @@ METHOD WvgCheckBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgCheckBox:handleEvent( nMessage, aNM ) DO CASE @@ -195,24 +181,18 @@ 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 ) IF HB_ISSTRING( xCaption ) @@ -221,5 +201,3 @@ METHOD WvgCheckBox:setCaption( xCaption ) ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/class.prg b/harbour/contrib/gtwvg/class.prg index abf2b32439..17aa1da673 100644 --- a/harbour/contrib/gtwvg/class.prg +++ b/harbour/contrib/gtwvg/class.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * * GUI Components - * Copyright 2007 Pritpal Bedi + * Copyright 2007-2012 Pritpal Bedi * Based On: * * Video subsystem for Windows using GUI windows instead of Console @@ -55,17 +55,11 @@ * */ -// -// -// /* * Wvt*Classes * 2004 - * Pritpal Bedi + * Pritpal Bedi */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -73,8 +67,6 @@ #include "wvtwin.ch" -// - #define K_LBUTTONPRESSED 1021 #define K_RBUTTONPRESSED 1022 #define K_MBUTTONPRESSED 1023 @@ -92,19 +84,11 @@ #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 - */ -// - CREATE CLASS WvtDialog /* To hold previous settings */ @@ -189,8 +173,6 @@ CREATE CLASS WvtDialog ENDCLASS -// - METHOD WvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFontBold, nFontQuality ) LOCAL fnt_ := Wvt_GetFontInfo() @@ -247,8 +229,6 @@ METHOD WvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFon RETURN Self -// - METHOD WvtDialog:Create() LOCAL aPalette, i, j @@ -318,8 +298,6 @@ METHOD WvtDialog:Create() RETURN Self -// - METHOD WvtDialog:Destroy() IF HB_ISOBJECT( ::oMenu ) @@ -357,8 +335,6 @@ METHOD WvtDialog:Destroy() RETURN NIL -// - METHOD WvtDialog:Event() LOCAL nKey @@ -371,8 +347,6 @@ METHOD WvtDialog:Event() RETURN nKey -// - METHOD WvtDialog:Execute() IF ::nObjects == 0 @@ -388,8 +362,6 @@ METHOD WvtDialog:Execute() RETURN ::nKey -// - METHOD WvtDialog:Inkey() LOCAL n, oObj, nID, i @@ -608,8 +580,6 @@ METHOD WvtDialog:Inkey() RETURN ::nKey -// - METHOD WvtDialog:MouseOver() LOCAL mRow := MRow() @@ -632,16 +602,12 @@ METHOD WvtDialog:MouseOver() RETURN Self -// - METHOD WvtDialog:Update() Wvt_InvalidateRect( 0, 0, ::MaxRow(), ::MaxCol() ) RETURN Self -// - METHOD WvtDialog:CreateObjects() LOCAL i, nObjs @@ -697,8 +663,6 @@ METHOD WvtDialog:CreateObjects() RETURN self -// - METHOD WvtDialog:Eval( bBlock, p1, p2, p3, p4, p5 ) LOCAL lRet @@ -709,8 +673,6 @@ METHOD WvtDialog:Eval( bBlock, p1, p2, p3, p4, p5 ) RETURN lRet -// - METHOD WvtDialog:ActivateMenu() LOCAL nMenu := Wvt_GetLastMenuEvent() @@ -728,18 +690,11 @@ METHOD WvtDialog:ActivateMenu() RETURN Self -// -// -// /* * Class WvtObject * * Must never be used directly. It is parent class FOR all other objects! */ -// -// -// - CREATE CLASS WvtObject VAR oParent @@ -851,8 +806,6 @@ CREATE CLASS WvtObject ENDCLASS -// - METHOD WvtObject:New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) IF ! HB_ISNUMERIC( nID ) @@ -935,8 +888,6 @@ METHOD WvtObject:New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtObject:Create() ::Eval( ::bOnCreate ) @@ -944,8 +895,6 @@ METHOD WvtObject:Create() RETURN Self -// - METHOD WvtObject:Destroy() IF ::hFont != nil @@ -960,8 +909,6 @@ METHOD WvtObject:Destroy() RETURN NIL -// - METHOD WvtObject:CreatePopup() LOCAL i, nID @@ -981,8 +928,6 @@ METHOD WvtObject:CreatePopup() RETURN Self -// - METHOD WvtObject:ShowPopup() LOCAL lRet := .F., nRet, n, aPos @@ -1005,16 +950,9 @@ METHOD WvtObject:ShowPopup() RETURN lRet -// -// -// /* * Class WvtBrowse */ -// -// -// - CREATE CLASS WvtBrowse FROM WvtObject VAR cAlias @@ -1047,16 +985,12 @@ CREATE CLASS WvtBrowse FROM WvtObject ENDCLASS -// - METHOD WvtBrowse:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_BROWSE, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtBrowse:Create() SELECT( ::cAlias ) @@ -1091,8 +1025,6 @@ METHOD WvtBrowse:Create() RETURN Self -// - METHOD WvtBrowse:SetVBar() IF ::lVSBar @@ -1123,8 +1055,6 @@ METHOD WvtBrowse:SetVBar() RETURN Self -// - METHOD WvtBrowse:SetHBar() IF ::lHSBar @@ -1153,8 +1083,6 @@ METHOD WvtBrowse:SetHBar() RETURN Self -// - METHOD WvtBrowse:Refresh() LOCAL nWorkArea := Select() @@ -1172,8 +1100,6 @@ METHOD WvtBrowse:Refresh() RETURN Self -// - METHOD WvtBrowse:HandleEvent( nKey ) LOCAL lRet := .F. @@ -1184,8 +1110,6 @@ METHOD WvtBrowse:HandleEvent( nKey ) RETURN lRet -// - METHOD WvtBrowse:NotifyChild( nIndex, nKey, oCurObj ) LOCAL xData, i @@ -1217,8 +1141,6 @@ METHOD WvtBrowse:NotifyChild( nIndex, nKey, oCurObj ) RETURN Self -// - METHOD WvtBrowse:Hilite() LOCAL b := ::oBrw @@ -1227,8 +1149,6 @@ METHOD WvtBrowse:Hilite() RETURN Self -// - METHOD WvtBrowse:DeHilite() LOCAL b := ::oBrw @@ -1237,8 +1157,6 @@ METHOD WvtBrowse:DeHilite() RETURN Self -// - METHOD WvtBrowse:SetTooltip() LOCAL cTip, nArea @@ -1264,8 +1182,6 @@ METHOD WvtBrowse:SetTooltip() RETURN Self -// - METHOD WvtBrowse:SaveSettings() IF HB_ISBLOCK( ::bSaveSettings ) @@ -1274,8 +1190,6 @@ METHOD WvtBrowse:SaveSettings() RETURN Self -// - METHOD WvtBrowse:RestSettings() IF ::xSettings != NIL .AND. HB_ISBLOCK( ::bRestSettings ) @@ -1284,8 +1198,6 @@ METHOD WvtBrowse:RestSettings() RETURN Self -// - METHOD WvtBrowse:PaintBlock( nPaintObj ) LOCAL bBlock, b := ::oBrw @@ -1316,16 +1228,9 @@ METHOD WvtBrowse:PaintBlock( nPaintObj ) RETURN Self -// -// -// /* * WvtStatusBar */ -// -// -// - CREATE CLASS WvtStatusBar FROM WvtObject VAR aPanels @@ -1342,8 +1247,6 @@ CREATE CLASS WvtStatusBar FROM WvtObject ENDCLASS -// - METHOD WvtStatusBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) __defaultNIL( @nTop, oParent:MaxRow() ) @@ -1357,8 +1260,6 @@ METHOD WvtStatusBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtStatusBar:Create() ::Refresh() @@ -1368,8 +1269,6 @@ METHOD WvtStatusBar:Create() RETURN Self -// - METHOD WvtStatusBar:PaintBlock() LOCAL a_ := {}, nPanels @@ -1386,8 +1285,6 @@ METHOD WvtStatusBar:PaintBlock() RETURN Self -// - METHOD WvtStatusBar:SetPanels( aPanels ) LOCAL i, oPanel, nID @@ -1420,8 +1317,6 @@ METHOD WvtStatusBar:SetPanels( aPanels ) RETURN self -// - METHOD WvtStatusBar:Update( nPanel, cText, cColor ) LOCAL oPanel @@ -1435,8 +1330,6 @@ METHOD WvtStatusBar:Update( nPanel, cText, cColor ) RETURN Self -// - METHOD WvtStatusBar:SetText( nPanel, cText, cColor ) LOCAL oPanel @@ -1451,8 +1344,6 @@ METHOD WvtStatusBar:SetText( nPanel, cText, cColor ) RETURN Self -// - METHOD WvtStatusBar:SetIcon( nPanel, cIconFile ) IF nPanel > 0 .AND. nPanel <= Len( ::aPanels ) @@ -1461,8 +1352,6 @@ METHOD WvtStatusBar:SetIcon( nPanel, cIconFile ) RETURN Self -// - METHOD WvtStatusBar:Refresh() LOCAL i @@ -1473,16 +1362,9 @@ METHOD WvtStatusBar:Refresh() RETURN NIL -// -// -// /* * Class WvtPanel */ -// -// -// - CREATE CLASS WvtPanel FROM WvtObject VAR cColor @@ -1497,16 +1379,12 @@ CREATE CLASS WvtPanel FROM WvtObject ENDCLASS -// - METHOD WvtPanel:New( oParent, nId, nTop, nLeft ) ::Super:New( oParent, DLG_OBJ_PANEL, nId, nTop, nLeft, nTop ) RETURN Self -// - METHOD WvtPanel:Refresh() IF ::Text != nil @@ -1515,16 +1393,9 @@ METHOD WvtPanel:Refresh() RETURN Self -// -// -// /* * Class WvtLabel */ -// -// -// - CREATE CLASS WvtLabel FROM WvtObject ACCESS TEXT INLINE iif( ::cText == nil, "", ::cText ) @@ -1542,16 +1413,12 @@ CREATE CLASS WvtLabel FROM WvtObject ENDCLASS -// - METHOD WvtLabel:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_LABEL, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtLabel:Create( lConfg ) __defaultNIL( @lConfg, .F. ) @@ -1577,16 +1444,12 @@ METHOD WvtLabel:Create( lConfg ) RETURN Self -// - METHOD WvtLabel:Refresh() Eval( ::bPaint ) RETURN Self -// - METHOD WvtLabel:SetText( cTxt ) IF HB_ISSTRING( cTxt ) @@ -1596,8 +1459,6 @@ METHOD WvtLabel:SetText( cTxt ) RETURN Self -// - METHOD WvtLabel:SetTextColor( nRGB ) IF HB_ISNUMERIC( nRGB ) @@ -1608,8 +1469,6 @@ METHOD WvtLabel:SetTextColor( nRGB ) RETURN Self -// - METHOD WvtLabel:SetBackColor( nRGB ) IF HB_ISNUMERIC( nRGB ) @@ -1620,8 +1479,6 @@ METHOD WvtLabel:SetBackColor( nRGB ) RETURN Self -// - METHOD WvtLabel:Configure() ::nTextColorHoverOff := ::nTextColor @@ -1636,8 +1493,6 @@ METHOD WvtLabel:Configure() RETURN Self -// - METHOD WvtLabel:HoverOn() LOCAL lOn := .F. @@ -1657,8 +1512,6 @@ METHOD WvtLabel:HoverOn() RETURN Self -// - METHOD WvtLabel:HoverOff() LOCAL lOn := .F. @@ -1678,16 +1531,9 @@ METHOD WvtLabel:HoverOff() RETURN Self -// -// -// /* * Class WvtToolBar */ -// -// -// - CREATE CLASS WvtToolBar FROM WvtObject VAR nPaintID @@ -1713,8 +1559,6 @@ CREATE CLASS WvtToolBar FROM WvtObject ENDCLASS -// - METHOD WvtToolBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) nTop := 0 @@ -1730,8 +1574,6 @@ METHOD WvtToolBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtToolBar:Create() IF ::lFloating @@ -1749,8 +1591,6 @@ METHOD WvtToolBar:Create() RETURN Self -// - METHOD WvtToolBar:Refresh() IF ::lFloating @@ -1761,8 +1601,6 @@ METHOD WvtToolBar:Refresh() RETURN Self -// - METHOD WvtToolBar:PaintToolBar() IF ( ::lActive ) @@ -1771,8 +1609,6 @@ METHOD WvtToolBar:PaintToolBar() RETURN Self -// - METHOD WvtToolBar:AddButton( cFileImage, bBlock, cTooltip ) LOCAL oObj, nCol @@ -1806,8 +1642,6 @@ METHOD WvtToolBar:AddButton( cFileImage, bBlock, cTooltip ) RETURN Self -// - METHOD WvtToolBar:HoverOn() IF ::lFloating .AND. ::lHidden @@ -1824,8 +1658,6 @@ METHOD WvtToolBar:HoverOn() RETURN self -// - METHOD WvtToolBar:HoverOff() IF ::lFloating .AND. ! ::lHidden @@ -1841,16 +1673,9 @@ METHOD WvtToolBar:HoverOff() RETURN Self -// -// -// /* * Class WvtToolButton */ -// -// -// - CREATE CLASS WvtToolButton FROM WvtObject VAR cFileImage @@ -1869,16 +1694,12 @@ CREATE CLASS WvtToolButton FROM WvtObject ENDCLASS -// - METHOD WvtToolButton:New( oParent ) ::Super:New( oParent, DLG_OBJ_BUTTON ) RETURN Self -// - METHOD WvtToolButton:Create() ::bPaint := {|| ::PaintButton() } @@ -1889,8 +1710,6 @@ METHOD WvtToolButton:Create() RETURN Self -// - METHOD WvtToolButton:Refresh() IF ::lActive @@ -1899,8 +1718,6 @@ METHOD WvtToolButton:Refresh() RETURN Self -// - METHOD WvtToolButton:PaintButton() IF ::lActive @@ -1913,8 +1730,6 @@ METHOD WvtToolButton:PaintButton() RETURN Self -// - METHOD WvtToolButton:LeftDown() LOCAL lRet := .F. @@ -1926,8 +1741,6 @@ METHOD WvtToolButton:LeftDown() RETURN lRet -// - METHOD WvtToolButton:LeftUp() LOCAL lRet := .F. @@ -1940,8 +1753,6 @@ METHOD WvtToolButton:LeftUp() RETURN lRet -// - METHOD WvtToolButton:HoverOn() ::oParent:HoverOn() @@ -1952,8 +1763,6 @@ METHOD WvtToolButton:HoverOn() RETURN Self -// - METHOD WvtToolButton:HoverOff() ::oParent:HoverOff() @@ -1964,16 +1773,9 @@ METHOD WvtToolButton:HoverOff() RETURN Self -// -// -// /* * Class WvtImage */ -// -// -// - CREATE CLASS WvtImage FROM WvtObject VAR cImageFile @@ -1987,16 +1789,12 @@ CREATE CLASS WvtImage FROM WvtObject ENDCLASS -// - METHOD WvtImage:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_IMAGE, nId, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtImage:Create() ::bPaint := {|| iif( hb_FileExists( ::cImage ), ; @@ -2009,8 +1807,6 @@ METHOD WvtImage:Create() RETURN Self -// - METHOD WvtImage:SetImage( cImage ) IF cImage != NIL .AND. hb_FileExists( cImage ) @@ -2020,16 +1816,9 @@ METHOD WvtImage:SetImage( cImage ) RETURN Self -// -// -// /* * Class WvtStatic */ -// -// -// - CREATE CLASS WvtStatic FROM WvtObject VAR nStatic @@ -2059,16 +1848,12 @@ CREATE CLASS WvtStatic FROM WvtObject ENDCLASS -// - METHOD WvtStatic:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_STATIC, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtStatic:Create() LOCAL lInside := .F. @@ -2148,36 +1933,23 @@ METHOD WvtStatic:Create() RETURN Self -// - METHOD WvtStatic:HoverOn() RETURN Self -// - METHOD WvtStatic:HoverOff() RETURN Self -// - METHOD WvtStatic:Refresh() Eval( ::bPaint ) RETURN Self -// -// -// /* * Class WvtPushButton */ -// -// -// - CREATE CLASS WvtPushButton FROM WvtObject VAR cCaption @@ -2194,16 +1966,12 @@ CREATE CLASS WvtPushButton FROM WvtObject ENDCLASS -// - METHOD WvtPushButton:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_PUSHBUTTON, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtPushButton:Create() ::bPaint := {|| ::PaintButton() } @@ -2215,8 +1983,6 @@ METHOD WvtPushButton:Create() RETURN Self -// - METHOD WvtPushButton:PaintButton() IF ::cCaption == nil @@ -2228,16 +1994,12 @@ METHOD WvtPushButton:PaintButton() RETURN Self -// - METHOD WvtPushButton:LeftDown() Wvt_DrawToolButtonState( ::nTop, ::nLeft, ::nBottom, ::nRight, { 0, 0, 0, 0 }, 2 ) RETURN .T. -// - METHOD WvtPushButton:LeftUp() Wvt_DrawToolButtonState( ::nTop, ::nLeft, ::nBottom, ::nRight, { 0, 0, 0, 0 }, 1 ) @@ -2245,16 +2007,9 @@ METHOD WvtPushButton:LeftUp() RETURN .T. -// -// -// /* * Class WvtGets */ -// -// -// - CREATE CLASS WvtGets FROM WvtObject VAR aGetList INIT {} @@ -2278,16 +2033,12 @@ CREATE CLASS WvtGets FROM WvtObject ENDCLASS -// - METHOD WvtGets:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_GETS, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtGets:Create() LOCAL i @@ -2312,8 +2063,6 @@ METHOD WvtGets:Create() RETURN Self -// - METHOD WvtGets:PaintBlock( nIndex ) LOCAL nLen, bPaint @@ -2328,28 +2077,20 @@ 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 ) AAdd( ::aGetList, { nRow, nCol, xVar, cPic, bValid, bWhen, cColor } ) RETURN Self -// - METHOD WvtGets:HandleEvent( nKey ) LOCAL lRet := .F. @@ -2362,54 +2103,37 @@ METHOD WvtGets:HandleEvent( nKey ) RETURN lRet -// - METHOD WvtGets:Read() ReadModal( ::GetList, ::nCurGet ) RETURN Self -// - METHOD WvtGets:GetData() LOCAL aData := NIL RETURN aData -// - METHOD WvtGets:SetData( /*aData*/ ) RETURN Self -// - METHOD WvtGets:Hilite() hb_DispOutAt( ::nTop, ::nLeft, PadR( " " + ::cDesc, ::nRight - ::nLeft + 1 ), ::cColorHilite ) RETURN Self -// - METHOD WvtGets:DeHilite() hb_DispOutAt( ::nTop, ::nLeft, PadR( " " + ::cDesc, ::nRight - ::nLeft + 1 ), ::cColorDeHilite ) RETURN Self -// -// -// /* * Class WvtScrollBar */ -// -// -// - CREATE CLASS WvtScrollBar FROM WvtObject VAR nBarType INIT WVT_SCROLLBAR_VERT @@ -2467,16 +2191,12 @@ CREATE CLASS WvtScrollBar FROM WvtObject ENDCLASS -// - METHOD wvtScrollbar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_SCROLLBAR, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD wvtScrollbar:Create() IF ::nTop == NIL .OR. ::nLeft == nil @@ -2577,8 +2297,6 @@ METHOD wvtScrollbar:Create() RETURN Self -// - METHOD wvtScrollbar:Configure( nTop, nLeft, nBottom, nRight ) ::nTop := nTop @@ -2641,16 +2359,12 @@ METHOD wvtScrollbar:Configure( nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD wvtScrollbar:Refresh() Eval( ::bBtnScroll ) RETURN Self -// - METHOD wvtScrollbar:SetPos( nTotal, nCurrent ) __defaultNIL( @nTotal, Eval( ::bTotal ) ) @@ -2664,8 +2378,6 @@ METHOD wvtScrollbar:SetPos( nTotal, nCurrent ) RETURN Self -// - METHOD wvtScrollbar:ThumbPos() LOCAL nNewPos, nRecPerUnit, nCurUnit @@ -2715,14 +2427,10 @@ METHOD wvtScrollbar:ThumbPos() RETURN Self -// - METHOD wvtScrollbar:GetPos() RETURN ::nCurrent -// - METHOD wvtScrollbar:SetTooltip() ::Tooltip := hb_ntos( Int( ::nCurrent ) ) + " / " + hb_ntos( Int( ::nTotal ) ) @@ -2731,8 +2439,6 @@ METHOD wvtScrollbar:SetTooltip() RETURN Self -// - METHOD wvtScrollbar:HandleEvent( nKey ) LOCAL nmRow, nmCol, nOff @@ -2942,16 +2648,9 @@ METHOD wvtScrollbar:HandleEvent( nKey ) RETURN lHit -// -// -// /* * CLASS WvtBanner */ -// -// -// - CREATE CLASS WvtBanner FROM WvtObject VAR nTimeDelay INIT 0.5 /* One-half Second */ @@ -2981,16 +2680,12 @@ CREATE CLASS WvtBanner FROM WvtObject ENDCLASS -// - METHOD WvtBanner:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_BANNER, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtBanner:Create() ::cDispText := ::cText @@ -3023,30 +2718,22 @@ METHOD WvtBanner:Create() RETURN Self -// - METHOD WvtBanner:Destroy() Wvg_DeleteObject( ::oLabel:hFont ) RETURN NIL -// - METHOD WvtBanner:Configure() RETURN Self -// - METHOD WvtBanner:OnTimer() ::Refresh() RETURN Self -// - METHOD WvtBanner:SetText( cText ) IF cText != nil @@ -3056,8 +2743,6 @@ METHOD WvtBanner:SetText( cText ) RETURN Self -// - METHOD WvtBanner:Refresh() LOCAL nNewTime @@ -3098,32 +2783,21 @@ METHOD WvtBanner:Refresh() RETURN Self -// - METHOD WvtBanner:HoverOn() ::oLabel:HoverOn() RETURN Self -// - METHOD WvtBanner:HoverOff() ::oLabel:HoverOff() RETURN Self -// -// -// /* * Class WvtTextBox */ -// -// -// - CREATE CLASS WvtTextBox FROM WvtObject VAR cText INIT "" @@ -3138,16 +2812,12 @@ CREATE CLASS WvtTextBox FROM WvtObject ENDCLASS -// - METHOD WvtTextBox:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_TEXTBOX, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtTextBox:Create() ::nTextColorHoverOff := ::nTextColor @@ -3168,22 +2838,16 @@ METHOD WvtTextBox:Create() RETURN Self -// - METHOD WvtTextBox:Refresh() Eval( ::bPaint ) RETURN Self -// - METHOD WvtTextBox:Configure() RETURN Self -// - METHOD WvtTextBox:SetText( cText ) IF cText != nil @@ -3193,8 +2857,6 @@ METHOD WvtTextBox:SetText( cText ) RETURN Self -// - METHOD WvtTextBox:HoverOn( /*cText*/ ) IF ::nTextColorHoverOn != nil @@ -3204,8 +2866,6 @@ METHOD WvtTextBox:HoverOn( /*cText*/ ) RETURN Self -// - METHOD WvtTextBox:HoverOff( /*cText*/ ) IF ::nTextColorHoverOn != nil @@ -3215,16 +2875,9 @@ METHOD WvtTextBox:HoverOff( /*cText*/ ) RETURN Self -// -// -// /* * Class WvtProgressBar */ -// -// -// - CREATE CLASS WvtProgressBar FROM WvtObject VAR cImage @@ -3249,16 +2902,12 @@ CREATE CLASS WvtProgressBar FROM WvtObject ENDCLASS -// - METHOD WvtProgressBar:New( oParent, nID, nTop, nLeft, nBottom, nRight ) ::Super:New( oParent, DLG_OBJ_PROGRESSBAR, nID, nTop, nLeft, nBottom, nRight ) RETURN Self -// - METHOD WvtProgressBar:Create() __defaultNIL( @::nTop, 0 ) @@ -3275,8 +2924,6 @@ METHOD WvtProgressBar:Create() RETURN Self -// - METHOD WvtProgressBar:Display( nCurrent, nTotal ) IF ! ::lActive @@ -3300,8 +2947,6 @@ METHOD WvtProgressBar:Display( nCurrent, nTotal ) RETURN Self -// - METHOD WvtProgressBar:Activate() ::cScreen := SaveScreen( ::nTop, ::nLeft, ::nBottom, ::nRight ) @@ -3310,8 +2955,6 @@ METHOD WvtProgressBar:Activate() RETURN Self -// - METHOD WvtProgressBar:DeActivate() ::lActive := .F. @@ -3322,17 +2965,10 @@ METHOD WvtProgressBar:DeActivate() RETURN Self -// -// -// /* * Class WvtMenu * Peter Rees */ -// -// -// - CREATE CLASS wvtMenu METHOD create( cCaption ) @@ -3356,8 +2992,6 @@ CREATE CLASS wvtMenu ENDCLASS -// - METHOD wvtMenu:Create( cCaption ) ::aItems := {} @@ -3371,8 +3005,6 @@ METHOD wvtMenu:Create( cCaption ) RETURN Self -// - METHOD wvtMenu:Destroy() IF ! Empty( ::hMenu ) @@ -3388,8 +3020,6 @@ METHOD wvtMenu:Destroy() RETURN .T. -// - METHOD wvtMenu:AddItem( cCaption, bAction ) LOCAL lResult := .F., aItem @@ -3420,8 +3050,6 @@ METHOD wvtMenu:AddItem( cCaption, bAction ) RETURN lResult -// - METHOD wvtMenu:DelAllItems() LOCAL lResult := .T., nItems @@ -3434,8 +3062,6 @@ METHOD wvtMenu:DelAllItems() RETURN lResult -// - METHOD wvtMenu:DelItem( nItemNum ) LOCAL lResult := .F. @@ -3456,8 +3082,6 @@ METHOD wvtMenu:DelItem( nItemNum ) RETURN lResult -// - METHOD wvtMenu:EnableItem( nItemNum ) LOCAL nPrevious := - 1 @@ -3468,8 +3092,6 @@ METHOD wvtMenu:EnableItem( nItemNum ) RETURN nPrevious -// - METHOD wvtMenu:DisableItem( nItemNum ) LOCAL nPrevious := - 1 @@ -3480,14 +3102,10 @@ METHOD wvtMenu:DisableItem( nItemNum ) RETURN nPrevious -// - METHOD wvtMenu:NumItems() RETURN Len( ::aItems ) -// - METHOD wvtMenu:GetItem( nItemNum ) LOCAL nItems := ::NumItems(), aResult := NIL @@ -3498,8 +3116,6 @@ METHOD wvtMenu:GetItem( nItemNum ) RETURN aResult -// - METHOD wvtMenu:FindMenuItemById( nId ) LOCAL x, aResult := {} @@ -3518,24 +3134,15 @@ METHOD wvtMenu:FindMenuItemById( nId ) RETURN aResult -// - METHOD wvtMenu:DrawMenuBar() Wvt_DrawMenuBar() RETURN NIL -// -// -// /* * Class WvtConsole */ -// -// -// - CREATE CLASS WvtConsole FROM WvtObject METHOD New( oParent ) @@ -3544,16 +3151,12 @@ CREATE CLASS WvtConsole FROM WvtObject ENDCLASS -// - METHOD WvtConsole:New( oParent ) ::Super:New( oParent, DLG_OBJ_CONSOLE, , - 1, - 1, - 1, - 1 ) RETURN Self -// - METHOD WvtConsole:Say( nRow, nCol, xExp, cColor ) LOCAL nCRow, nCCol, nCursor @@ -3569,8 +3172,6 @@ METHOD WvtConsole:Say( nRow, nCol, xExp, cColor ) RETURN Self -// - METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor ) LOCAL nCRow, nCCol, nCursor @@ -3586,16 +3187,9 @@ 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 */ #define _TBCI_COLPOS 3 /* column position on screen */ @@ -3612,8 +3206,6 @@ 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 */ -// - CREATE CLASS TBrowseWvg FROM TBrowse VAR aColumnsSep INIT {} @@ -3622,8 +3214,6 @@ CREATE CLASS TBrowseWvg FROM TBrowse ENDCLASS -// - METHOD TBrowseWvg:SetVisible() LOCAL lFirst, aCol, nColPos @@ -3650,5 +3240,3 @@ METHOD TBrowseWvg:SetVisible() NEXT RETURN Self - -// diff --git a/harbour/contrib/gtwvg/combobox.prg b/harbour/contrib/gtwvg/combobox.prg index ecee83f2aa..030e1d27e7 100644 --- a/harbour/contrib/gtwvg/combobox.prg +++ b/harbour/contrib/gtwvg/combobox.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpTreeView compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 26Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef VAR TYPE INIT WVGCOMBO_DROPDOWN @@ -118,8 +110,6 @@ CREATE CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD WvgComboBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -134,8 +124,6 @@ METHOD WvgComboBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgComboBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -176,20 +164,15 @@ 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 - IF HB_ISOBJECT( ::oSLE ) ::oSLE:destroy() ENDIF @@ -201,8 +184,6 @@ METHOD WvgComboBox:destroy() RETURN NIL -// - METHOD WvgComboBox:handleEvent( nMessage, aNM ) DO CASE @@ -274,8 +255,6 @@ METHOD WvgComboBox:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -// - METHOD WvgComboBox:addItem( cItem ) IF HB_ISSTRING( cItem ) @@ -284,8 +263,6 @@ METHOD WvgComboBox:addItem( cItem ) RETURN - 1 -// - METHOD WvgComboBox:listBoxFocus( lFocus ) LOCAL lOldFocus := ::sendCBMessage( CB_GETDROPPEDSTATE ) @@ -296,8 +273,6 @@ METHOD WvgComboBox:listBoxFocus( lFocus ) RETURN lOldFocus -// - METHOD WvgComboBox:sleSize() IF HB_ISOBJECT( ::oSLE ) @@ -306,8 +281,6 @@ METHOD WvgComboBox:sleSize() RETURN { 0, 0 } -// - METHOD WvgComboBox:listBoxSize() IF HB_ISOBJECT( ::oListBox ) @@ -316,8 +289,6 @@ METHOD WvgComboBox:listBoxSize() RETURN { 0, 0 } -// - METHOD WvgComboBox:setIcon( nItem, cIcon ) HB_SYMBOL_UNUSED( nItem ) @@ -325,8 +296,6 @@ METHOD WvgComboBox:setIcon( nItem, cIcon ) RETURN Self -// - METHOD WvgComboBox:itemMarked( ... ) LOCAL a_ := hb_AParams() @@ -339,8 +308,6 @@ METHOD WvgComboBox:itemMarked( ... ) RETURN Self -// - METHOD WvgComboBox:itemSelected( ... ) LOCAL a_ := hb_AParams() @@ -353,8 +320,6 @@ METHOD WvgComboBox:itemSelected( ... ) RETURN Self -// - METHOD WvgComboBox:drawItem( ... ) LOCAL a_ := hb_AParams() diff --git a/harbour/contrib/gtwvg/crt.prg b/harbour/contrib/gtwvg/crt.prg index a9d2c8987f..af4c96bc1c 100644 --- a/harbour/contrib/gtwvg/crt.prg +++ b/harbour/contrib/gtwvg/crt.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,13 @@ * */ -// -// -// -// // EkOnkar // ( The LORD is ONE ) // // Xbase++ Compatible xbpCrt Class // -// Pritpal Bedi +// Pritpal Bedi // 08Nov2008 -// -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +66,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler VAR oMenu @@ -256,10 +246,6 @@ CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler ENDCLASS -// -// Instance Initiation -// - METHOD WvgCrt:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -282,10 +268,6 @@ 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. @@ -362,8 +344,6 @@ METHOD WvgCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) __defaultNIL( @oParent , ::oParent ) @@ -382,8 +362,6 @@ METHOD WvgCrt:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgCrt:destroy() IF HB_ISOBJECT( ::oMenu ) @@ -409,44 +387,30 @@ 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() hb_gtInfo( HB_GTI_DISABLE, ::pGT ) RETURN Self -// - METHOD WvgCrt:enable() hb_gtInfo( HB_GTI_ENABLE, ::pGT ) RETURN Self -// - METHOD WvgCrt:getFrameState() IF WVG_IsIconic( ::hWnd ) @@ -458,34 +422,24 @@ 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() hb_gtInfo( HB_GTI_SPEC, HB_GTS_SHOWWINDOW, HB_GTS_SW_HIDE ) RETURN Self -// - METHOD WvgCrt:invalidateRect( nTop, nLeft, nBottom, nRight ) __defaultNIL( @nTop, 0 ) @@ -497,32 +451,22 @@ 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() IF ! HB_ISOBJECT( ::oMenu ) @@ -531,32 +475,22 @@ 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. @@ -576,44 +510,30 @@ METHOD WvgCrt:setFrameState( nState ) 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 ) IF HB_ISARRAY( aSize ) @@ -625,8 +545,6 @@ METHOD WvgCrt:setSize( aSize, lPaint ) RETURN Self -// - METHOD WvgCrt:show() hb_gtInfo( HB_GTI_SPEC, HB_GTS_SHOWWINDOW, SW_NORMAL ) @@ -634,40 +552,26 @@ 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 ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_enter ) @@ -682,8 +586,6 @@ METHOD WvgCrt:enter( xParam ) RETURN Self -// - METHOD WvgCrt:leave( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_leave ) @@ -698,8 +600,6 @@ METHOD WvgCrt:leave( xParam ) RETURN Self -// - METHOD WvgCrt:lbClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbClick ) @@ -714,8 +614,6 @@ METHOD WvgCrt:lbClick( xParam ) RETURN Self -// - METHOD WvgCrt:lbDblClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbDblClick ) @@ -730,8 +628,6 @@ METHOD WvgCrt:lbDblClick( xParam ) RETURN Self -// - METHOD WvgCrt:lbDown( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbDown ) @@ -746,8 +642,6 @@ METHOD WvgCrt:lbDown( xParam ) RETURN Self -// - METHOD WvgCrt:lbUp( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbUp ) @@ -762,8 +656,6 @@ METHOD WvgCrt:lbUp( xParam ) RETURN Self -// - METHOD WvgCrt:mbClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbClick ) @@ -778,8 +670,6 @@ METHOD WvgCrt:mbClick( xParam ) RETURN Self -// - METHOD WvgCrt:mbDblClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbDblClick ) @@ -794,8 +684,6 @@ METHOD WvgCrt:mbDblClick( xParam ) RETURN Self -// - METHOD WvgCrt:mbDown( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbDown ) @@ -810,8 +698,6 @@ METHOD WvgCrt:mbDown( xParam ) RETURN Self -// - METHOD WvgCrt:mbUp( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbUp ) @@ -826,8 +712,6 @@ METHOD WvgCrt:mbUp( xParam ) RETURN Self -// - METHOD WvgCrt:motion( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_motion ) @@ -842,8 +726,6 @@ METHOD WvgCrt:motion( xParam ) RETURN Self -// - METHOD WvgCrt:rbClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbClick ) @@ -858,8 +740,6 @@ METHOD WvgCrt:rbClick( xParam ) RETURN Self -// - METHOD WvgCrt:rbDblClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbDblClick ) @@ -874,8 +754,6 @@ METHOD WvgCrt:rbDblClick( xParam ) RETURN Self -// - METHOD WvgCrt:rbDown( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbDown ) @@ -890,8 +768,6 @@ METHOD WvgCrt:rbDown( xParam ) RETURN Self -// - METHOD WvgCrt:rbUp( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbUp ) @@ -906,8 +782,6 @@ METHOD WvgCrt:rbUp( xParam ) RETURN Self -// - METHOD WvgCrt:wheel( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_wheel ) @@ -922,10 +796,6 @@ METHOD WvgCrt:wheel( xParam ) RETURN Self -// -// Other Messages -// - METHOD WvgCrt:close( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_close ) @@ -940,8 +810,6 @@ METHOD WvgCrt:close( xParam ) RETURN Self -// - METHOD WvgCrt:helpRequest( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_helpRequest ) @@ -956,8 +824,6 @@ METHOD WvgCrt:helpRequest( xParam ) RETURN Self -// - METHOD WvgCrt:keyboard( xParam ) IF HB_ISNUMERIC( xParam ) .AND. HB_ISBLOCK( ::sl_keyboard ) @@ -972,8 +838,6 @@ METHOD WvgCrt:keyboard( xParam ) RETURN Self -// - METHOD WvgCrt:killDisplayFocus( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_killDisplayFocus ) @@ -988,8 +852,6 @@ METHOD WvgCrt:killDisplayFocus( xParam ) RETURN Self -// - METHOD WvgCrt:killInputFocus( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_killInputFocus ) @@ -1004,8 +866,6 @@ METHOD WvgCrt:killInputFocus( xParam ) RETURN Self -// - METHOD WvgCrt:move( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_move ) @@ -1020,8 +880,6 @@ METHOD WvgCrt:move( xParam ) RETURN Self -// - METHOD WvgCrt:paint( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_paint ) @@ -1036,8 +894,6 @@ METHOD WvgCrt:paint( xParam ) RETURN Self -// - METHOD WvgCrt:quit( xParam, xParam1 ) IF HB_ISNUMERIC( xParam ) .AND. HB_ISBLOCK( ::sl_quit ) @@ -1052,8 +908,6 @@ METHOD WvgCrt:quit( xParam, xParam1 ) RETURN Self -// - METHOD WvgCrt:resize( xParam ) IF HB_ISBLOCK( xParam )/* .or. HB_ISNIL( xParam ) */ @@ -1066,8 +920,6 @@ METHOD WvgCrt:resize( xParam ) RETURN Self -// - METHOD WvgCrt:setDisplayFocus( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::setDisplayFocus ) @@ -1082,8 +934,6 @@ METHOD WvgCrt:setDisplayFocus( xParam ) RETURN Self -// - METHOD WvgCrt:setInputFocus( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_setInputFocus ) @@ -1098,8 +948,6 @@ METHOD WvgCrt:setInputFocus( xParam ) RETURN Self -// - METHOD WvgCrt:dragEnter( xParam, xParam1 ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_dragEnter ) @@ -1114,8 +962,6 @@ METHOD WvgCrt:dragEnter( xParam, xParam1 ) RETURN Self -// - METHOD WvgCrt:dragMotion( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_dragMotion ) @@ -1130,8 +976,6 @@ METHOD WvgCrt:dragMotion( xParam ) RETURN Self -// - METHOD WvgCrt:dragLeave( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_dragLeave ) @@ -1146,8 +990,6 @@ METHOD WvgCrt:dragLeave( xParam ) RETURN Self -// - METHOD WvgCrt:dragDrop( xParam, xParam1 ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_dragDrop ) @@ -1161,5 +1003,3 @@ METHOD WvgCrt:dragDrop( xParam, xParam1 ) ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/dataref.prg b/harbour/contrib/gtwvg/dataref.prg index 0e922b67c2..c8453b4e4e 100644 --- a/harbour/contrib/gtwvg/dataref.prg +++ b/harbour/contrib/gtwvg/dataref.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ dataRef Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 06Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgDataRef VAR changed INIT .F. @@ -101,14 +93,10 @@ CREATE CLASS WvgDataRef ENDCLASS -// - METHOD WvgDataRef:new() RETURN self -// - METHOD WvgDataRef:getData() DO CASE @@ -145,8 +133,6 @@ METHOD WvgDataRef:getData() RETURN ::sl_editBuffer -// - METHOD WvgDataRef:setData( xValue, mp2 ) LOCAL s @@ -197,14 +183,10 @@ METHOD WvgDataRef:setData( xValue, mp2 ) RETURN ::sl_editBuffer -// - METHOD WvgDataRef:undo() RETURN .F. -// - METHOD WvgDataRef:validate( xParam ) IF PCount() == 0 .AND. HB_ISBLOCK( ::sl_validate ) @@ -214,5 +196,3 @@ METHOD WvgDataRef:validate( xParam ) ENDIF RETURN .T. - -// diff --git a/harbour/contrib/gtwvg/dialog.prg b/harbour/contrib/gtwvg/dialog.prg index eb1aa343d5..6662fb51fb 100644 --- a/harbour/contrib/gtwvg/dialog.prg +++ b/harbour/contrib/gtwvg/dialog.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ Compatible xbpDialog Class * - * Pritpal Bedi + * Pritpal Bedi * 17Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgDialog FROM WvgWindow VAR oMenu @@ -94,16 +86,11 @@ CREATE CLASS WvgDialog FROM WvgWindow METHOD showModal() INLINE NIL METHOD setTitle( cTitle ) INLINE ::title := cTitle, hb_gtInfo( HB_GTI_WINTITLE, cTitle ) METHOD getTitle() INLINE hb_gtInfo( HB_GTI_WINTITLE ) - METHOD calcClientRect() INLINE ::aRect := Wvg_GetClientRect( ::hWnd ), ; - { 0, 0, ::aRect[ 3 ], ::aRect[ 4 ] } - METHOD calcFrameRect() INLINE ::aRect := Wvg_GetWindowRect( ::hWnd ), ; - { ::aRect[ 1 ], ::aRect[ 2 ], ; - ::aRect[ 3 ] - ::aRect[ 1 ], ::aRect[ 4 ] - ::aRect[ 2 ] } + METHOD calcClientRect() INLINE ::aRect := Wvg_GetClientRect( ::hWnd ), { 0, 0, ::aRect[ 3 ], ::aRect[ 4 ] } + METHOD calcFrameRect() INLINE ::aRect := Wvg_GetWindowRect( ::hWnd ), { ::aRect[ 1 ], ::aRect[ 2 ], ::aRect[ 3 ] - ::aRect[ 1 ], ::aRect[ 4 ] - ::aRect[ 2 ] } ENDCLASS -// - METHOD WvgDialog:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -117,8 +104,6 @@ METHOD WvgDialog:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) LOCAL oW @@ -177,16 +162,12 @@ METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgDialog:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgDialog:destroy() IF HB_ISOBJECT( ::oMenu ) @@ -206,8 +187,6 @@ METHOD WvgDialog:destroy() RETURN Self -// - METHOD WvgDialog:setFrameState( nState ) LOCAL lSuccess := .F. @@ -227,8 +206,6 @@ METHOD WvgDialog:setFrameState( nState ) RETURN lSuccess -// - METHOD WvgDialog:getFrameState() IF Wvg_IsIconic( ::hWnd ) @@ -240,8 +217,6 @@ METHOD WvgDialog:getFrameState() RETURN WVGDLG_FRAMESTAT_NORMALIZED -// - METHOD WvgDialog:menuBar() IF ! HB_ISOBJECT( ::oMenu ) @@ -249,5 +224,3 @@ METHOD WvgDialog:menuBar() ENDIF RETURN ::oMenu - -// diff --git a/harbour/contrib/gtwvg/drawarea.prg b/harbour/contrib/gtwvg/drawarea.prg index d1765be3e8..f6e816171b 100644 --- a/harbour/contrib/gtwvg/drawarea.prg +++ b/harbour/contrib/gtwvg/drawarea.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2009 Pritpal Bedi + * Copyright 2009-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ WvgDialog's Helper Class * - * Pritpal Bedi + * Pritpal Bedi * 15Feb2009 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgDrawingArea INHERIT WvgWindow VAR caption INIT "" @@ -89,8 +81,6 @@ CREATE CLASS WvgDrawingArea INHERIT WvgWindow ENDCLASS -// - METHOD WvgDrawingArea:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -103,8 +93,6 @@ METHOD WvgDrawingArea:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgDrawingArea:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) HB_SYMBOL_UNUSED( lVisible ) @@ -122,8 +110,6 @@ METHOD WvgDrawingArea:create( oParent, oOwner, aPos, aSize, aPresParams, lVisibl RETURN Self -// - METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) DO CASE @@ -148,8 +134,6 @@ METHOD WvgDrawingArea:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -// - METHOD destroy() CLASS WvgDrawingArea hb_traceLog( " %s:destroy()", __objGetClsName( self ) ) @@ -157,5 +141,3 @@ METHOD destroy() CLASS WvgDrawingArea ::wvgWindow:destroy() RETURN NIL - -// diff --git a/harbour/contrib/gtwvg/genrc.prg b/harbour/contrib/gtwvg/genrc.prg index 8d427070b9..f2b30b5dc9 100644 --- a/harbour/contrib/gtwvg/genrc.prg +++ b/harbour/contrib/gtwvg/genrc.prg @@ -50,10 +50,6 @@ * */ -// -// -// -// // EkOnkar // ( The LORD is ONE ) // @@ -62,10 +58,6 @@ // Pritpal Bedi // 03Dec2011 // -// -// -// - #include "hbclass.ch" #include "inkey.ch" #include "hbgtinfo.ch" @@ -74,12 +66,8 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - THREAD STATIC t_oCrt := NIL -// - EXIT PROCEDURE KillGTChildren() IF HB_ISOBJECT( t_oCrt ) .AND. __objGetClsName( t_oCrt ) == "WVGCRT" .AND. t_oCrt:isGT @@ -89,8 +77,6 @@ EXIT PROCEDURE KillGTChildren() RETURN -// - FUNCTION WvgSetAppWindow( oCrt ) LOCAL ooCrt := t_oCrt @@ -109,5 +95,3 @@ FUNCTION WvgSetAppWindow( oCrt ) ENDIF RETURN ooCrt - -// diff --git a/harbour/contrib/gtwvg/hbgtwvg.ch b/harbour/contrib/gtwvg/hbgtwvg.ch index e75b3f466f..6229f9309c 100644 --- a/harbour/contrib/gtwvg/hbgtwvg.ch +++ b/harbour/contrib/gtwvg/hbgtwvg.ch @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for the WVG*Classes * - * Copyright 2004 Pritpal Bedi + * Copyright 2004 Pritpal Bedi * www - http://www.xharbour.org http://harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/contrib/gtwvg/htmlview.prg b/harbour/contrib/gtwvg/htmlview.prg index ff9fd14c2e..d008702f9b 100644 --- a/harbour/contrib/gtwvg/htmlview.prg +++ b/harbour/contrib/gtwvg/htmlview.prg @@ -7,7 +7,7 @@ * Source file for the Wvg*Classes * * Copyright 2008 Andy Wos - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -51,21 +51,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpHtmlViewer compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 08Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -75,24 +69,20 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// +#define evBeforeNavigate 100 +#define evNavigateComplete 101 +#define evStatusTextChange 102 +#define evDownloadComplete 104 +#define evCommandStateChange 105 +#define evDownloadBegin 106 +#define evProgressChange 108 +#define evTitleChange 113 -#define evBeforeNavigate 100 -#define evNavigateComplete 101 -#define evStatusTextChange 102 -#define evDownloadComplete 104 -#define evCommandStateChange 105 -#define evDownloadBegin 106 -#define evProgressChange 108 -#define evTitleChange 113 - -#define evPropertyChange 112 -#define evBeforeNavigate2 250 -#define evNavigateComplete2 252 -#define evDocumentComplete 259 -#define evNavigateError 271 - -// +#define evPropertyChange 112 +#define evBeforeNavigate2 250 +#define evNavigateComplete2 252 +#define evDocumentComplete 259 +#define evNavigateError 271 CREATE CLASS WvgHTMLViewer INHERIT WvgActiveXControl @@ -141,8 +131,6 @@ CREATE CLASS WvgHTMLViewer INHERIT WvgActiveXControl ENDCLASS -// - METHOD WvgHTMLViewer:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -151,8 +139,6 @@ METHOD WvgHTMLViewer:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -174,8 +160,6 @@ METHOD WvgHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -// - METHOD WvgHTMLViewer:xBeforeNavigate( cURL, Flags, TFName, PData, Headers ) HB_SYMBOL_UNUSED( Flags ) @@ -190,8 +174,6 @@ METHOD WvgHTMLViewer:xBeforeNavigate( cURL, Flags, TFName, PData, Headers ) RETURN Self -// - METHOD WvgHTMLViewer:xStatusTextChange( cText ) IF HB_ISBLOCK( ::sl_statusTextChange ) @@ -200,8 +182,6 @@ METHOD WvgHTMLViewer:xStatusTextChange( cText ) RETURN Self -// - METHOD WvgHTMLViewer:xNavigateComplete( cURL ) IF HB_ISBLOCK( ::sl_navigateComplete ) @@ -210,8 +190,6 @@ METHOD WvgHTMLViewer:xNavigateComplete( cURL ) RETURN Self -// - METHOD WvgHTMLViewer:xProgressChange( nProgress, nProgMax ) IF HB_ISBLOCK( ::sl_progressChange ) @@ -220,8 +198,6 @@ METHOD WvgHTMLViewer:xProgressChange( nProgress, nProgMax ) RETURN Self -// - METHOD WvgHTMLViewer:xTitleChange( cTitle ) IF HB_ISBLOCK( ::sl_titleChange ) @@ -230,8 +206,6 @@ METHOD WvgHTMLViewer:xTitleChange( cTitle ) RETURN Self -// - METHOD WvgHTMLViewer:xDocumentComplete( cURI ) IF HB_ISBLOCK( ::sl_documentComplete ) @@ -240,13 +214,9 @@ METHOD WvgHTMLViewer:xDocumentComplete( cURI ) RETURN Self -// - METHOD WvgHTMLViewer:setHTML( cHTML ) ::document:innerHTML := cHTML ::refresh() RETURN self - -// diff --git a/harbour/contrib/gtwvg/listbox.prg b/harbour/contrib/gtwvg/listbox.prg index 3eb223f4d2..225437a455 100644 --- a/harbour/contrib/gtwvg/listbox.prg +++ b/harbour/contrib/gtwvg/listbox.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpTreeView compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 26Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgListBox INHERIT WvgWindow, WvgDataRef VAR adjustHeight INIT .F. @@ -139,8 +131,6 @@ CREATE CLASS WvgListBox INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD WvgListBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -152,8 +142,6 @@ METHOD WvgListBox:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgListBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -182,8 +170,6 @@ METHOD WvgListBox:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgListBox:handleEvent( nMessage, aNM ) DO CASE @@ -304,24 +290,18 @@ METHOD WvgListBox:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -// - METHOD WvgListBox:clear() ::sendMessage( LB_RESETCONTENT, 0, 0 ) 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 c31d0ce384..1744ac390f 100644 --- a/harbour/contrib/gtwvg/menubar.prg +++ b/harbour/contrib/gtwvg/menubar.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ Compatible xbpMenuBar Class * - * Pritpal Bedi + * Pritpal Bedi * 22Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgMenuBar INHERIT wvgWindow VAR hMenu @@ -137,8 +129,6 @@ CREATE CLASS WvgMenuBar INHERIT wvgWindow ENDCLASS -// - METHOD WvgMenuBar:new( oParent, aPresParams, lVisible ) __defaultNIL( @oParent, ::oParent ) @@ -153,8 +143,6 @@ METHOD WvgMenuBar:new( oParent, aPresParams, lVisible ) RETURN Self -// - METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) __defaultNIL( @oParent, ::oParent ) @@ -194,8 +182,6 @@ METHOD WvgMenuBar:create( oParent, aPresParams, lVisible ) RETURN Self -// - METHOD WvgMenuBar:configure( oParent, aPresParams, lVisible ) __defaultNIL( @oParent, ::oParent ) @@ -208,8 +194,6 @@ METHOD WvgMenuBar:configure( oParent, aPresParams, lVisible ) RETURN Self -// - METHOD WvgMenuBar:destroy() IF ! Empty( ::hMenu ) @@ -226,8 +210,6 @@ METHOD WvgMenuBar:destroy() RETURN .T. -// - METHOD WvgMenuBar:delAllItems() LOCAL lResult := .T., nItems @@ -240,8 +222,6 @@ METHOD WvgMenuBar:delAllItems() RETURN lResult -// - METHOD WvgMenuBar:delItem( nItemNum ) LOCAL lResult := .F. @@ -262,11 +242,9 @@ METHOD WvgMenuBar:delItem( nItemNum ) RETURN lResult -// /* * { xCaption, bAction, nStyle, nAttrb } */ - METHOD WvgMenuBar:addItem( aItem, p2, p3, p4 ) LOCAL xCaption, bAction, nStyle, nAttrib @@ -286,8 +264,6 @@ METHOD WvgMenuBar:addItem( aItem, p2, p3, p4 ) RETURN ::putItem( { xCaption, bAction, nStyle, nAttrib }, - 1, .T. ) -// - METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) LOCAL nItemIndex, cCaption @@ -368,8 +344,6 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) RETURN nItemIndex -// - METHOD WvgMenuBar:findMenuItemById( nId ) LOCAL x, aResult := {} @@ -391,8 +365,6 @@ METHOD WvgMenuBar:findMenuItemById( nId ) RETURN aResult -// - METHOD WvgMenuBar:findMenuPosById( nId ) LOCAL x, nPos @@ -414,8 +386,6 @@ METHOD WvgMenuBar:findMenuPosById( nId ) RETURN nPos -// - METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) LOCAL nRet := - 1 @@ -428,8 +398,6 @@ METHOD WvgMenuBar:checkItem( nItemNum, lCheck ) RETURN iif( nRet == -1, .F., .T. ) -// - METHOD WvgMenuBar:enableItem( nItemNum ) LOCAL lSuccess := .F. @@ -440,8 +408,6 @@ METHOD WvgMenuBar:enableItem( nItemNum ) RETURN lSuccess -// - METHOD WvgMenuBar:disableItem( nItemNum ) LOCAL lSuccess := .F. @@ -452,8 +418,6 @@ METHOD WvgMenuBar:disableItem( nItemNum ) RETURN lSuccess -// - METHOD WvgMenuBar:getItem( nItemNum ) IF HB_ISNUMERIC( nItemNum ) .AND. nItemNum > 0 .AND. nItemNum <= Len( ::aMenuItems ) @@ -462,28 +426,20 @@ METHOD WvgMenuBar:getItem( nItemNum ) RETURN NIL -// - METHOD WvgMenuBar:insItem( nItemNum, aItem ) ::putItem( aItem, nItemNum, .T. ) 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 ) IF HB_ISNUMERIC( nItemNum ) @@ -492,16 +448,10 @@ METHOD WvgMenuBar:selectItem( nItemNum ) RETURN .T. -// - METHOD WvgMenuBar:setItem( nItemNum, aItem ) RETURN ::putItem( aItem, nItemNum, .F. ) -// -/* Callback Methods */ -// - METHOD WvgMenuBar:beginMenu( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -511,8 +461,6 @@ METHOD WvgMenuBar:beginMenu( xParam ) RETURN Self -// - METHOD WvgMenuBar:endMenu( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -522,8 +470,6 @@ METHOD WvgMenuBar:endMenu( xParam ) RETURN Self -// - METHOD WvgMenuBar:itemMarked( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -533,8 +479,6 @@ METHOD WvgMenuBar:itemMarked( xParam ) RETURN Self -// - METHOD WvgMenuBar:itemSelected( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -544,8 +488,6 @@ METHOD WvgMenuBar:itemSelected( xParam ) RETURN Self -// - METHOD WvgMenuBar:drawItem( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -555,8 +497,6 @@ METHOD WvgMenuBar:drawItem( xParam ) RETURN Self -// - METHOD WvgMenuBar:measureItem( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -566,8 +506,6 @@ METHOD WvgMenuBar:measureItem( xParam ) RETURN Self -// - METHOD WvgMenuBar:onMenuKey( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -577,16 +515,9 @@ METHOD WvgMenuBar:onMenuKey( xParam ) RETURN Self -// -// -// /* * Xbase++ compatible xbpMenu class */ -// -// -// - CREATE CLASS WvgMenu INHERIT WvgMenuBar VAR title INIT "" @@ -600,8 +531,6 @@ CREATE CLASS WvgMenu INHERIT WvgMenuBar ENDCLASS -// - METHOD WvgMenu:new( oParent, aPresParams, lVisible ) __defaultNIL( @oParent, ::oParent ) @@ -614,8 +543,6 @@ METHOD WvgMenu:new( oParent, aPresParams, lVisible ) RETURN Self -// - METHOD WvgMenu:create( oParent, aPresParams, lVisible ) __defaultNIL( @oParent, ::oParent ) @@ -632,20 +559,14 @@ 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 diff --git a/harbour/contrib/gtwvg/mle.prg b/harbour/contrib/gtwvg/mle.prg index beb5134743..4339a4ecce 100644 --- a/harbour/contrib/gtwvg/mle.prg +++ b/harbour/contrib/gtwvg/mle.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpMLE compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 07Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,14 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - -#ifndef __DBG_PARTS__ -#xtranslate hb_traceLog( [] ) => -#endif - -// - CREATE CLASS WvgMLE INHERIT WvgWindow, WvgDataRef VAR border INIT .T. @@ -133,8 +119,6 @@ CREATE CLASS WvgMLE INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD WvgMLE:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -146,8 +130,6 @@ METHOD WvgMLE:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgMLE:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -187,12 +169,8 @@ METHOD WvgMLE:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgMLE:handleEvent( nMessage, aNM ) - hb_traceLog( " %s:handleEvent( %i )", __objGetClsName( self ), nMessage ) - DO CASE CASE nMessage == HB_GTE_COMMAND @@ -271,8 +249,6 @@ METHOD WvgMLE:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -// - METHOD WvgMLE:destroy() hb_traceLog( " %s:destroy()", __objGetClsName( self ) ) @@ -281,8 +257,6 @@ METHOD WvgMLE:destroy() RETURN NIL -// - METHOD WvgMLE:changed( lChanged ) LOCAL lChg := ::sendMessage( EM_GETMODIFY, 0, 0 ) @@ -293,8 +267,6 @@ METHOD WvgMLE:changed( lChanged ) RETURN lChg -// - METHOD WvgMLE:clear() LOCAL cText := ::getData() @@ -303,8 +275,6 @@ METHOD WvgMLE:clear() RETURN Len( cText ) -// - METHOD WvgMLE:copyMarked() LOCAL n, nB, nE @@ -319,8 +289,6 @@ METHOD WvgMLE:copyMarked() RETURN n -// - METHOD WvgMLE:cutMarked() LOCAL n, nB, nE, cText @@ -335,5 +303,3 @@ METHOD WvgMLE:cutMarked() ENDIF RETURN n - -// diff --git a/harbour/contrib/gtwvg/paint.prg b/harbour/contrib/gtwvg/paint.prg index 5be147a5fd..f69524af2a 100644 --- a/harbour/contrib/gtwvg/paint.prg +++ b/harbour/contrib/gtwvg/paint.prg @@ -5,7 +5,7 @@ /* * Harbour Project source code: * - * Copyright 2004 Pritpal Bedi + * Copyright 2004 Pritpal Bedi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,23 +48,14 @@ * */ -// -// -// /* * Routines to manage Wvt*Classes Gui Painting */ -// -// -// #include "wvtwin.ch" -// - THREAD STATIC t_paint_ := { { "", {} } } -// /* * This function must have to be defined in your appls */ @@ -79,8 +70,6 @@ FUNCTION Wvt_Paint() #endif -// - FUNCTION WvtPaintObjects() LOCAL i, lExe, nLeft, nRight, b, tlbr_, aBlocks, nBlocks @@ -142,8 +131,6 @@ FUNCTION WvtPaintObjects() RETURN 0 -// - FUNCTION WvtSetPaint( a_ ) LOCAL o @@ -162,8 +149,6 @@ FUNCTION WvtSetPaint( a_ ) RETURN o -// - FUNCTION Wvg_SetPaint( cID, nAction, xData, aAttr ) LOCAL n, n1, oldData @@ -186,8 +171,6 @@ FUNCTION Wvg_SetPaint( cID, nAction, xData, aAttr ) RETURN oldData -// - FUNCTION Wvg_GetPaint( cID ) LOCAL n @@ -198,8 +181,6 @@ FUNCTION Wvg_GetPaint( cID ) RETURN {} -// - FUNCTION Wvg_DelPaint( cID, nAction ) LOCAL xData, n1, n @@ -213,8 +194,6 @@ FUNCTION Wvg_DelPaint( cID, nAction ) RETURN xData -// - FUNCTION Wvg_PurgePaint( cID, lDummy ) LOCAL n, aPaint @@ -232,8 +211,6 @@ FUNCTION Wvg_PurgePaint( cID, lDummy ) RETURN aPaint -// - FUNCTION Wvg_InsertPaint( cID, aPaint, lSet ) LOCAL n @@ -252,19 +229,12 @@ 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 @@ -278,8 +248,6 @@ FUNCTION Wvt_SetDlgCoMode( nMode ) RETURN nOldMode -// - FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle, ; cFaceName, nPointSize, nWeight, lItalic, nHelpId, nExStyle ) @@ -359,8 +327,6 @@ 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 ) @@ -424,8 +390,6 @@ 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 @@ -467,8 +431,6 @@ FUNCTION Wvt_CreateDialog( acnDlg, lOnTop, cbDlgProc, ncIcon, nTimerTicks, hMenu RETURN hDlg -// - FUNCTION Wvt_DialogBox( acnDlg, cbDlgProc, hWndParent ) LOCAL nResult, cType, xTemplate, nDlgMode @@ -494,7 +456,6 @@ FUNCTION Wvt_DialogBox( acnDlg, cbDlgProc, hWndParent ) RETURN nResult -// /* Wvt_GetOpenFileName( hWnd, @cPath, cTitle, aFilter, nFlags, cInitDir, cDefExt, nIndex ) @@ -510,7 +471,6 @@ cDefName: DEFAULT file name Returns: If OFN_ALLOWMULTISELECT ? Array of files selected : FileName. */ - FUNCTION Wvt_GetOpenFilename( hWnd, cPath, cTitle, acFilter, nFlags, cInitDir, cDefExt, nFilterIndex, cDefName ) LOCAL cRet, aTmp, xRet, i @@ -540,7 +500,6 @@ FUNCTION Wvt_GetOpenFilename( hWnd, cPath, cTitle, acFilter, nFlags, cInitDir, c RETURN xRet -// /* Wvt_GetSaveFileName( hWnd, cDefFile, cTitle, acFilter, nFlags, cInitDir, cDefExt, @nFilterIndex ) @@ -555,7 +514,6 @@ nIndex: Index position of types Returns: FileName. */ - FUNCTION Wvt_GetSaveFilename( hWnd, cDefName, cTitle, acFilter, nFlags, cInitDir, cDefExt, nFilterIndex ) LOCAL cRet, aTmp, xRet, i, cPath @@ -584,33 +542,21 @@ 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 ) IF HB_ISNUMERIC( ncIconRes ) @@ -626,8 +572,6 @@ FUNCTION Wvt_SetIcon( ncIconRes, cIconName ) RETURN NIL -// - FUNCTION Wvt_SetFont( cFontName, nSize, nWidth, nWeight, nQuality ) __defaultNIL( @cFontName, hb_gtInfo( HB_GTI_FONTNAME ) ) @@ -638,47 +582,38 @@ 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 ) -#define CYAN RGB( 0x0 ,0x85,0x85 ) -#define RED RGB( 0x85,0x0 ,0x0 ) -#define MAGENTA RGB( 0x85,0x0 ,0x85 ) -#define BROWN RGB( 0x85,0x85,0x0 ) -#define LIGHT_GRAY RGB( 0xC6,0xC6,0xC6 ) -#define GRAY RGB( 0x60,0x60,0x60 ) -#define BRIGHT_BLUE RGB( 0x00,0x00,0xFF ) -#define BRIGHT_GREEN RGB( 0x60,0xFF,0x60 ) -#define BRIGHT_CYAN RGB( 0x60,0xFF,0xFF ) -#define BRIGHT_RED RGB( 0xF8,0x00,0x26 ) -#define BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF ) -#define YELLOW RGB( 0xFF,0xFF,0x00 ) -#define WHITE RGB( 0xFF,0xFF,0xFF ) +#define BLACK RGB( 0x0 ,0x0 ,0x0 ) +#define BLUE RGB( 0x0 ,0x0 ,0x85 ) +#define GREEN RGB( 0x0 ,0x85,0x0 ) +#define CYAN RGB( 0x0 ,0x85,0x85 ) +#define RED RGB( 0x85,0x0 ,0x0 ) +#define MAGENTA RGB( 0x85,0x0 ,0x85 ) +#define BROWN RGB( 0x85,0x85,0x0 ) +#define LIGHT_GRAY RGB( 0xC6,0xC6,0xC6 ) +#define GRAY RGB( 0x60,0x60,0x60 ) +#define BRIGHT_BLUE RGB( 0x00,0x00,0xFF ) +#define BRIGHT_GREEN RGB( 0x60,0xFF,0x60 ) +#define BRIGHT_CYAN RGB( 0x60,0xFF,0xFF ) +#define BRIGHT_RED RGB( 0xF8,0x00,0x26 ) +#define BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF ) +#define YELLOW RGB( 0xFF,0xFF,0x00 ) +#define WHITE RGB( 0xFF,0xFF,0xFF ) FUNCTION Wvt_GetRGBColorBYString( cColor, nForeBack ) @@ -715,32 +650,22 @@ 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 ) __defaultNIL( @lCenter, .T. ) @@ -748,8 +673,6 @@ FUNCTION Wvt_CenterWindow( lCenter, lRePaint ) RETURN hb_gtInfo( HB_GTI_SPEC, HB_GTS_CENTERWINDOW, { lCenter, lRePaint } ) -// - FUNCTION Wvt_WindowCentre( lCenter, lRePaint ) __defaultNIL( @lCenter, .T. ) @@ -757,36 +680,26 @@ FUNCTION Wvt_WindowCentre( lCenter, lRePaint ) RETURN hb_gtInfo( HB_GTI_SPEC, HB_GTS_CENTERWINDOW, { lCenter, lRePaint } ) -// - FUNCTION Wvt_ProcessMessages() hb_gtInfo( HB_GTI_SPEC, HB_GTS_PROCESSMESSAGES ) RETURN .T. -// - FUNCTION Wvt_Keyboard( nKey ) hb_gtInfo( HB_GTI_SPEC, HB_GTS_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 @@ -800,76 +713,50 @@ 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 3650bc3062..c1cb48c20a 100644 --- a/harbour/contrib/gtwvg/parthdlr.prg +++ b/harbour/contrib/gtwvg/parthdlr.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ Compatible xbpPartHandler Class * - * Pritpal Bedi + * Pritpal Bedi * 08Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgPartHandler VAR cargo @@ -111,8 +103,6 @@ CREATE CLASS WvgPartHandler ENDCLASS -// - METHOD WvgPartHandler:new( oParent, oOwner ) ::oParent := oParent @@ -120,8 +110,6 @@ METHOD WvgPartHandler:new( oParent, oOwner ) RETURN Self -// - METHOD WvgPartHandler:create( oParent, oOwner ) __defaultNIL( @oParent, ::oParent ) @@ -132,8 +120,6 @@ METHOD WvgPartHandler:create( oParent, oOwner ) RETURN Self -// - METHOD WvgPartHandler:configure( oParent, oOwner ) __defaultNIL( @oParent, ::oParent ) @@ -144,8 +130,6 @@ METHOD WvgPartHandler:configure( oParent, oOwner ) RETURN Self -// - METHOD WvgPartHandler:destroy() ::hChildren := NIL @@ -155,8 +139,6 @@ METHOD WvgPartHandler:destroy() RETURN Self -// - METHOD WvgPartHandler:handleEvent( hEvent, mp1, mp2 ) HB_SYMBOL_UNUSED( hEvent ) @@ -165,14 +147,10 @@ METHOD WvgPartHandler:handleEvent( hEvent, mp1, mp2 ) RETURN Self -// - METHOD WvgPartHandler:status() RETURN ::nStatus -// - METHOD WvgPartHandler:addChild( oWvg ) oWvg:nNameID := oWvg:nID @@ -180,8 +158,6 @@ METHOD WvgPartHandler:addChild( oWvg ) RETURN Self -// - METHOD WvgPartHandler:childFromName( nNameId ) LOCAL i, oWvg @@ -194,14 +170,10 @@ METHOD WvgPartHandler:childFromName( nNameId ) RETURN oWvg -// - METHOD WvgPartHandler:childList() RETURN ::aChildren -// - METHOD WvgPartHandler:removeChild( oChild ) LOCAL n @@ -212,8 +184,6 @@ METHOD WvgPartHandler:removeChild( oChild ) RETURN Self -// - METHOD WvgPartHandler:delChild( oWvg ) LOCAL n @@ -226,8 +196,6 @@ METHOD WvgPartHandler:delChild( oWvg ) RETURN Self -// - METHOD WvgPartHandler:setName( nNameId ) LOCAL nOldNameId := ::nNameId @@ -238,8 +206,6 @@ METHOD WvgPartHandler:setName( nNameId ) RETURN nOldNameId -// - METHOD WvgPartHandler:setOwner( oWvg ) LOCAL oOldXbp := ::oOwner @@ -250,8 +216,6 @@ METHOD WvgPartHandler:setOwner( oWvg ) RETURN oOldXbp -// - METHOD WvgPartHandler:setParent( oWvg ) LOCAL oOldXbp := ::oParent @@ -262,8 +226,6 @@ METHOD WvgPartHandler:setParent( oWvg ) RETURN oOldXbp -// - METHOD WvgPartHandler:notifierBlock( ... ) LOCAL a_ := hb_AParams() @@ -278,12 +240,9 @@ METHOD WvgPartHandler:notifierBlock( ... ) RETURN NIL -// - /* This will be called by the WvgCRT() console FOR various events TO be propogated TO child controls */ - METHOD WvgPartHandler:notifier( nEvent, xParams ) LOCAL aPos, aMenuItem, nIndex, nCtrlID, oObj @@ -494,11 +453,9 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) RETURN nReturn -// /* This will be called if a control is assigned its own WndProc via ::SetWindowProcCallback() */ - METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) LOCAL nCtrlID, nNotifctn, hWndCtrl, nObj, aMenuItem, oObj, nReturn @@ -622,5 +579,3 @@ METHOD WvgPartHandler:controlWndProc( hWnd, nMessage, nwParam, nlParam ) ENDSWITCH RETURN Wvg_CallWindowProc( ::nOldProc, hWnd, nMessage, nwParam, nlParam ) - -// diff --git a/harbour/contrib/gtwvg/pushbut.prg b/harbour/contrib/gtwvg/pushbut.prg index e92b20a2cf..ac2c6c2ff0 100644 --- a/harbour/contrib/gtwvg/pushbut.prg +++ b/harbour/contrib/gtwvg/pushbut.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpPushButton Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 26Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgPushButton INHERIT WvgWindow VAR autosize INIT .F. @@ -102,8 +94,6 @@ CREATE CLASS WvgPushButton INHERIT WvgWindow ENDCLASS -// - METHOD WvgPushButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -114,8 +104,6 @@ METHOD WvgPushButton:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -149,8 +137,6 @@ METHOD WvgPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -// - METHOD WvgPushButton:handleEvent( nMessage, aNM ) DO CASE @@ -204,24 +190,18 @@ 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 ) __defaultNIL( @xCaption, ::caption ) @@ -245,8 +225,6 @@ METHOD WvgPushButton:setCaption( xCaption, cDll ) RETURN Self -// - METHOD WvgPushButton:activate( xParam ) IF HB_ISBLOCK( xParam ) .OR. xParam == NIL @@ -255,8 +233,6 @@ METHOD WvgPushButton:activate( xParam ) RETURN Self -// - METHOD WvgPushButton:draw( xParam ) IF HB_ISBLOCK( xParam ) .OR. xParam == NIL diff --git a/harbour/contrib/gtwvg/radiobut.prg b/harbour/contrib/gtwvg/radiobut.prg index 170a7efd08..09747fb9c0 100644 --- a/harbour/contrib/gtwvg/radiobut.prg +++ b/harbour/contrib/gtwvg/radiobut.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpPushButton Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 06Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,14 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - -#ifndef __DBG_PARTS__ -#xtranslate hb_traceLog( [] ) => -#endif - -// - CREATE CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef VAR autosize INIT .F. @@ -102,8 +88,6 @@ CREATE CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadioButton ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -114,8 +98,6 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadio RETURN Self -// - METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadioButton ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -138,8 +120,6 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRa RETURN Self -// - METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton hb_traceLog( " %s:handleEvent( %i )", __objGetClsName( self ), nMessage ) @@ -161,8 +141,6 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton RETURN 1 -// - METHOD destroy() CLASS WvgRadioButton hb_traceLog( " %s:destroy()", __objGetClsName( self ) ) @@ -171,16 +149,12 @@ METHOD destroy() CLASS WvgRadioButton RETURN NIL -// - METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgRadioButton ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD setCaption( xCaption ) CLASS WvgRadioButton IF HB_ISSTRING( xCaption ) @@ -189,5 +163,3 @@ METHOD setCaption( xCaption ) CLASS WvgRadioButton ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/scrollbr.prg b/harbour/contrib/gtwvg/scrollbr.prg index d98599084e..345c9a2944 100644 --- a/harbour/contrib/gtwvg/scrollbr.prg +++ b/harbour/contrib/gtwvg/scrollbr.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpScrollBar Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 17Feb2009 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef VAR autoTrack INIT .T. @@ -101,8 +93,6 @@ CREATE CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgScrollBar ::WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -113,8 +103,6 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgScrol RETURN Self -// - METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgScrollBar ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -151,8 +139,6 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSc RETURN Self -// - METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar LOCAL nScrMsg, nScrPos, nCommand @@ -317,8 +303,6 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgScrollBar RETURN EVENT_UNHANDELLED -// - METHOD destroy() CLASS WvgScrollBar hb_traceLog( " %s:destroy()", __objGetClsName( self ) ) @@ -327,8 +311,6 @@ METHOD destroy() CLASS WvgScrollBar RETURN NIL -// - METHOD Scroll( xParam ) CLASS WvgScrollBar IF HB_ISBLOCK( xParam ) @@ -337,8 +319,6 @@ METHOD Scroll( xParam ) CLASS WvgScrollBar RETURN self -// - METHOD setRange( aRange ) CLASS WvgScrollBar LOCAL aOldRange, nMin, nMax @@ -355,8 +335,6 @@ METHOD setRange( aRange ) CLASS WvgScrollBar RETURN aOldRange -// - METHOD setScrollBoxSize( nUnits ) CLASS WvgScrollBar LOCAL nOldUnits := nUnits diff --git a/harbour/contrib/gtwvg/sle.prg b/harbour/contrib/gtwvg/sle.prg index 0e0503c9de..46c84e4941 100644 --- a/harbour/contrib/gtwvg/sle.prg +++ b/harbour/contrib/gtwvg/sle.prg @@ -50,9 +50,6 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) @@ -62,9 +59,6 @@ * Pritpal Bedi * 07Dec2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgSLE INHERIT WvgWindow, WvgDataRef VAR align INIT WVGSLE_LEFT @@ -121,8 +113,6 @@ CREATE CLASS WvgSLE INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSLE ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -133,8 +123,6 @@ 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 } @@ -179,8 +167,6 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgSL RETURN Self -// - METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE DO CASE @@ -257,8 +243,6 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgSLE RETURN EVENT_UNHANDELLED -// - METHOD destroy() CLASS WvgSLE hb_traceLog( " %s:destroy()", __objGetClsName( self ) ) @@ -267,8 +251,6 @@ METHOD destroy() CLASS WvgSLE RETURN NIL -// - METHOD WvgSLE:changed( lChanged ) LOCAL lChg := ::sendMessage( EM_GETMODIFY, 0, 0 ) @@ -279,8 +261,6 @@ METHOD WvgSLE:changed( lChanged ) RETURN lChg -// - METHOD WvgSLE:clear() LOCAL cText := ::getData() @@ -289,8 +269,6 @@ METHOD WvgSLE:clear() RETURN Len( cText ) -// - METHOD WvgSLE:copyMarked() LOCAL n, nB, nE @@ -305,8 +283,6 @@ METHOD WvgSLE:copyMarked() RETURN n -// - METHOD WvgSLE:cutMarked() LOCAL n, nB, nE, cText @@ -322,8 +298,6 @@ METHOD WvgSLE:cutMarked() RETURN n -// - METHOD WvgSLE:returnPressed( ... ) LOCAL a_ := hb_AParams() @@ -335,5 +309,3 @@ METHOD WvgSLE:returnPressed( ... ) ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/statbar.prg b/harbour/contrib/gtwvg/statbar.prg index 2b98f4768d..9f524205ae 100644 --- a/harbour/contrib/gtwvg/statbar.prg +++ b/harbour/contrib/gtwvg/statbar.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpStatusBar Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 25Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,14 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - -#ifndef __DBG_PARTS__ -#xtranslate hb_traceLog( [] ) => -#endif - -// - CREATE CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */ VAR caption INIT "" @@ -106,8 +92,6 @@ CREATE CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */ ENDCLASS -// - METHOD WvgStatusBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -118,8 +102,6 @@ METHOD WvgStatusBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgStatusBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -142,15 +124,11 @@ METHOD WvgStatusBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -// - METHOD WvgStatusBar:handleEvent( nMessage, aNM ) LOCAL nHandled := 1 LOCAL nObj, aNMH - hb_traceLog( " %s:handleEvent( %i )", __objGetClsName( self ), nMessage ) - DO CASE CASE nMessage == HB_GTE_RESIZED @@ -198,14 +176,10 @@ METHOD WvgStatusBar:handleEvent( nMessage, aNM ) RETURN nHandled -// - METHOD WvgStatusBar:destroy() LOCAL i, nItems - hb_traceLog( " %s:destroy()", __objGetClsName() ) - IF ( nItems := Len( ::aItems ) ) > 0 FOR i := 1 TO nItems @@ -216,16 +190,12 @@ METHOD WvgStatusBar:destroy() RETURN NIL -// - METHOD WvgStatusBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) LOCAL oPanel, lSuccess @@ -250,8 +220,6 @@ METHOD WvgStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) RETURN oPanel -// - METHOD WvgStatusBar:delItem( nItemORcKey ) LOCAL nIndex := 0 @@ -269,8 +237,6 @@ METHOD WvgStatusBar:delItem( nItemORcKey ) RETURN Self -// - METHOD WvgStatusBar:getItem( nItemORcKey ) LOCAL nIndex := 0, oPanel @@ -289,8 +255,6 @@ METHOD WvgStatusBar:getItem( nItemORcKey ) RETURN oPanel -// - METHOD WvgStatusBar:clear() LOCAL i @@ -304,8 +268,6 @@ METHOD WvgStatusBar:clear() RETURN Self -// - METHOD WvgStatusBar:panelClick( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -314,8 +276,6 @@ METHOD WvgStatusBar:panelClick( xParam ) RETURN Self -// - METHOD WvgStatusBar:panelDblClick( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -324,16 +284,9 @@ METHOD WvgStatusBar:panelDblClick( xParam ) RETURN Self -// -// -// /* * WvgToolbarButton() Class compatible with XbpToolbarButton() */ -// -// -// - CREATE CLASS WvgStatusBarPanel VAR alignment INIT WVGALIGN_LEFT @@ -358,8 +311,6 @@ CREATE CLASS WvgStatusBarPanel ENDCLASS -// - METHOD WvgStatusBarPanel:new( cCaption, nStyle, cKey ) __defaultNIL( @cCaption, ::sl_caption ) @@ -372,8 +323,6 @@ METHOD WvgStatusBarPanel:new( cCaption, nStyle, 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 a4175fb35d..49cf8a1e24 100644 --- a/harbour/contrib/gtwvg/static.prg +++ b/harbour/contrib/gtwvg/static.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpTreeView compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 26Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgStatic INHERIT WvgWindow VAR autoSize INIT .F. @@ -97,8 +89,6 @@ CREATE CLASS WvgStatic INHERIT WvgWindow ENDCLASS -// - METHOD WvgStatic:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -111,8 +101,6 @@ METHOD WvgStatic:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgStatic:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -130,7 +118,6 @@ METHOD WvgStatic:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) SS_RIGHTJUST #endif - SWITCH ::type CASE WVGSTATIC_TYPE_TEXT IF ( hb_bitAnd( ::options, WVGSTATIC_TEXT_LEFT ) == WVGSTATIC_TEXT_LEFT ) @@ -237,8 +224,6 @@ METHOD WvgStatic:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgStatic:handleEvent( nMessage, aNM ) DO CASE @@ -269,13 +254,10 @@ METHOD WvgStatic:handleEvent( nMessage, aNM ) ENDIF - ENDCASE RETURN EVENT_UNHANDELLED -// - METHOD WvgStatic:destroy() IF ::hBitmap != nil @@ -285,16 +267,12 @@ 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 ) HB_SYMBOL_UNUSED( cDll ) diff --git a/harbour/contrib/gtwvg/syswnd.prg b/harbour/contrib/gtwvg/syswnd.prg index f29e0779af..af66c002bf 100644 --- a/harbour/contrib/gtwvg/syswnd.prg +++ b/harbour/contrib/gtwvg/syswnd.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ Compatible xbpPartHandler Class * - * Pritpal Bedi + * Pritpal Bedi * 08Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgSysWindow INHERIT WvgPartHandler METHOD new( oParent, oOwner, aPos ) @@ -113,8 +105,6 @@ CREATE CLASS WvgSysWindow INHERIT WvgPartHandler ENDCLASS -// - METHOD WvgSysWindow:new( oParent, oOwner, aPos ) __defaultNIL( @oParent, ::oParent ) @@ -129,8 +119,6 @@ METHOD WvgSysWindow:new( oParent, oOwner, aPos ) RETURN Self -// - METHOD WvgSysWindow:create( oParent, oOwner, aPos ) __defaultNIL( @oParent, ::oParent ) @@ -145,52 +133,36 @@ 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 ) Wvg_SetWindowPosition( ::hWnd, aPos[ 1 ], aPos[ 2 ], .F. ) RETURN Self -// - METHOD WvgSysWindow:currentPos() LOCAL aRect @@ -199,8 +171,6 @@ METHOD WvgSysWindow:currentPos() RETURN { aRect[ 1 ], aRect[ 2 ] } -// - METHOD WvgSysWindow:currentSize() LOCAL aRect @@ -209,16 +179,9 @@ METHOD WvgSysWindow:currentSize() RETURN { aRect[ 3 ] - aRect[ 1 ], aRect[ 4 ] - aRect[ 2 ] } -// -// -// /* * Class WvgFontDialog() */ -// -// -// - CREATE CLASS WvgFontDialog INHERIT WvgSysWindow /* Appearance */ @@ -292,8 +255,6 @@ CREATE CLASS WvgFontDialog INHERIT WvgSysWindow ENDCLASS -// - METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog __defaultNIL( @oParent, ::oParent ) @@ -312,8 +273,6 @@ METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog RETURN Self -// - METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialog __defaultNIL( @oParent, ::oParent ) @@ -341,8 +300,6 @@ METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos ) CLASS WvgFontDialo RETURN Self -// - METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog LOCAL aRect, nL, nH @@ -421,8 +378,6 @@ METHOD wndProc( hWnd, nMessage, nwParam, nlParam ) CLASS WvgFontDialog RETURN 0 -// - METHOD display( nMode ) CLASS WvgFontDialog LOCAL hWnd, aInfo @@ -442,19 +397,15 @@ METHOD display( nMode ) CLASS WvgFontDialog RETURN ::GetWvgFont( aInfo ) -// - METHOD destroy() CLASS WvgFontDialog /* hb_FreeCallBack( ::nWndProc ) */ RETURN Self -// /* * Only callable from ::activateOK and ::activateApply */ - METHOD GetWvgFont( aFont ) CLASS WvgFontDialog LOCAL oWvgFont @@ -480,16 +431,9 @@ METHOD GetWvgFont( aFont ) CLASS WvgFontDialog RETURN oWvgFont -// -// -// /* Class WvgFont() */ -// -// -// - CREATE CLASS WvgFont VAR hFont @@ -538,8 +482,6 @@ CREATE CLASS WvgFont ENDCLASS -// - METHOD new( oPS ) CLASS WvgFont __defaultNIL( @oPS, ::oPS ) @@ -548,8 +490,6 @@ METHOD new( oPS ) CLASS WvgFont RETURN Self -// - METHOD create( cFontName ) CLASS WvgFont __defaultNIL( @cFontName, ::familyName ) @@ -560,8 +500,6 @@ METHOD create( cFontName ) CLASS WvgFont RETURN Self -// - METHOD configure( cFontName ) CLASS WvgFont __defaultNIL( @cFontName, ::familyName ) @@ -572,8 +510,6 @@ METHOD configure( cFontName ) CLASS WvgFont RETURN Self -// - METHOD destroy() CLASS WvgFont IF ::hFont != NIL @@ -582,16 +518,12 @@ METHOD destroy() CLASS WvgFont RETURN Self -// - METHOD list() CLASS WvgFont LOCAL aList := {} RETURN aList -// - METHOD createFont() CLASS WvgFont LOCAL aFont @@ -632,5 +564,3 @@ METHOD createFont() CLASS WvgFont ::aFontInfo := aFont RETURN ::hFont - -// diff --git a/harbour/contrib/gtwvg/tabpage.prg b/harbour/contrib/gtwvg/tabpage.prg index 834bafbd9b..d266ef4d31 100644 --- a/harbour/contrib/gtwvg/tabpage.prg +++ b/harbour/contrib/gtwvg/tabpage.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2009 Pritpal Bedi + * Copyright 2009-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpTabPage compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 01Mar2009 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,14 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - -#ifndef __DBG_PARTS__ -#xtranslate hb_traceLog( [] ) => -#endif - -// - CREATE CLASS WvgTabPage INHERIT WvgWindow VAR caption INIT NIL /* Character string, Numeric, Object ("") */ @@ -106,8 +92,6 @@ CREATE CLASS WvgTabPage INHERIT WvgWindow ENDCLASS -// - METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPage ::WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -118,8 +102,6 @@ METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPa RETURN Self -// - METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPage ::WvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -154,8 +136,6 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTa RETURN Self -// - METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage LOCAL aHdr @@ -192,8 +172,6 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgTabPage RETURN EVENT_UNHANDELLED -// - METHOD tabActivate( xParam ) CLASS WvgTabPage IF HB_ISBLOCK( xParam ) @@ -202,32 +180,24 @@ METHOD tabActivate( xParam ) CLASS WvgTabPage RETURN self -// - METHOD minimize() CLASS WvgTabPage ::hide() RETURN .F. -// - METHOD maximize() CLASS WvgTabPage ::show() RETURN .T. -// - METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgTabPage ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD destroy() CLASS WvgTabPage ::wvgWindow:destroy() diff --git a/harbour/contrib/gtwvg/toolbar.prg b/harbour/contrib/gtwvg/toolbar.prg index b786ce3dfc..7dac5b0993 100644 --- a/harbour/contrib/gtwvg/toolbar.prg +++ b/harbour/contrib/gtwvg/toolbar.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpToolBar Compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 23Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/ VAR appearance @@ -127,8 +119,6 @@ CREATE CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/ ENDCLASS -// - METHOD WvgToolBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -144,8 +134,6 @@ METHOD WvgToolBar:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgToolBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -200,8 +188,6 @@ METHOD WvgToolBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgToolBar:handleEvent( nMessage, aNM ) LOCAL nObj, aNMMouse @@ -245,8 +231,6 @@ METHOD WvgToolBar:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -// - METHOD WvgToolBar:destroy() LOCAL i, nItems @@ -273,22 +257,16 @@ METHOD WvgToolBar:destroy() RETURN NIL -// - METHOD WvgToolBar:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( 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, nBtn @@ -364,64 +342,44 @@ 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() ::sendMessage( TB_AUTOSIZE, 0, 0 ) RETURN Self -// - METHOD WvgToolBar:buttonClick( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -430,8 +388,6 @@ METHOD WvgToolBar:buttonClick( xParam ) RETURN Self -// - METHOD WvgToolBar:change( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -440,8 +396,6 @@ METHOD WvgToolBar:change( xParam ) RETURN Self -// - METHOD WvgToolBar:buttonMenuClick( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -450,8 +404,6 @@ METHOD WvgToolBar:buttonMenuClick( xParam ) RETURN Self -// - METHOD WvgToolBar:buttonDropDown( xParam ) IF HB_ISBLOCK( xParam ) .OR. HB_ISNIL( xParam ) @@ -460,16 +412,9 @@ METHOD WvgToolBar:buttonDropDown( xParam ) RETURN Self -// -// -// /* * WvgToolbarButton() Class compatible with XbpToolbarButton() */ -// -// -// - CREATE CLASS WvgToolBarButton VAR enabled INIT .T. @@ -496,8 +441,6 @@ CREATE CLASS WvgToolBarButton ENDCLASS -// - METHOD WvgToolBarButton:new( cCaption, nStyle, cKey ) __defaultNIL( @cCaption, ::caption ) diff --git a/harbour/contrib/gtwvg/treeview.prg b/harbour/contrib/gtwvg/treeview.prg index 82b8eefb58..0e46c257ca 100644 --- a/harbour/contrib/gtwvg/treeview.prg +++ b/harbour/contrib/gtwvg/treeview.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,15 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ xbpTreeView compatible Class * - * Pritpal Bedi + * Pritpal Bedi * 26Nov2008 */ -// -// -// #include "hbclass.ch" #include "inkey.ch" @@ -74,8 +68,6 @@ #include "wvtwin.ch" #include "wvgparts.ch" -// - CREATE CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef VAR alwaysShowSelection INIT .F. @@ -122,8 +114,6 @@ CREATE CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef ENDCLASS -// - METHOD WvgTreeView:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -136,8 +126,6 @@ METHOD WvgTreeView:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgTreeView:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -171,8 +159,6 @@ METHOD WvgTreeView:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgTreeView:handleEvent( nMessage, aNM ) LOCAL aHdr @@ -272,16 +258,12 @@ METHOD WvgTreeView:handleEvent( nMessage, aNM ) RETURN EVENT_UNHANDELLED -// - METHOD WvgTreeView:destroy() ::wvgWindow:destroy() RETURN NIL -// - METHOD WvgTreeView:getSelectionInfo( nlParam ) LOCAL hItemSelected, hParentOfSelected @@ -302,24 +284,18 @@ METHOD WvgTreeView:getSelectionInfo( nlParam ) 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 ) IF HB_ISBLOCK( xParam ) .OR. xParam == NIL @@ -328,8 +304,6 @@ METHOD WvgTreeView:itemCollapsed( xParam ) RETURN Self -// - METHOD WvgTreeView:itemExpanded( xParam ) IF HB_ISBLOCK( xParam ) .OR. xParam == NIL @@ -338,8 +312,6 @@ METHOD WvgTreeView:itemExpanded( xParam ) RETURN Self -// - METHOD WvgTreeView:itemMarked( xParam ) IF HB_ISBLOCK( xParam ) .OR. xParam == NIL @@ -348,7 +320,6 @@ METHOD WvgTreeView:itemMarked( xParam ) RETURN Self -// #if 0 METHOD WvgTreeView:itemSelected( xParam ) @@ -361,10 +332,7 @@ METHOD WvgTreeView:itemSelected( xParam ) #endif -// /* Class WvgTreeViewItem */ -// - CREATE CLASS WvgTreeViewItem VAR caption INIT "" @@ -402,70 +370,50 @@ CREATE CLASS WvgTreeViewItem 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 HB_SYMBOL_UNUSED( cCaption ) RETURN NIL -// - METHOD setExpandedImage( nResIdoBitmap ) CLASS WvgTreeViewItem HB_SYMBOL_UNUSED( nResIdoBitmap ) RETURN NIL -// - METHOD setImage( nResIdoBitmap ) CLASS WvgTreeViewItem HB_SYMBOL_UNUSED( nResIdoBitmap ) RETURN NIL -// - METHOD setMarkedImage( nResIdoBitmap ) CLASS WvgTreeViewItem HB_SYMBOL_UNUSED( nResIdoBitmap ) RETURN NIL -// - METHOD addItem( cCaption ) CLASS WvgTreeViewItem LOCAL oItem, hParent @@ -485,26 +433,18 @@ 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 RETURN NIL diff --git a/harbour/contrib/gtwvg/wnd.prg b/harbour/contrib/gtwvg/wnd.prg index eb1be8066d..906cf5a9bb 100644 --- a/harbour/contrib/gtwvg/wnd.prg +++ b/harbour/contrib/gtwvg/wnd.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * Source file for the Wvg*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,21 +50,16 @@ * */ -// -// -// /* * EkOnkar * ( The LORD is ONE ) * * Xbase++ Compatible xbpWindow Class * - * Pritpal Bedi + * Pritpal Bedi * 08Nov2008 */ // -// -// #include "hbclass.ch" #include "inkey.ch" @@ -83,8 +78,6 @@ #define __BYSETPROP__ #endif -// - CREATE CLASS WvgWindow INHERIT WvgPartHandler /* CONFIGURATION */ @@ -271,8 +264,6 @@ CREATE CLASS WvgWindow INHERIT WvgPartHandler ENDCLASS -// - METHOD WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) __defaultNIL( @oParent , ::oParent ) @@ -293,8 +284,6 @@ METHOD WvgWindow:new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) __defaultNIL( @oParent , ::oParent ) @@ -321,8 +310,6 @@ METHOD WvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) RETURN Self -// - METHOD WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) __defaultNIL( @oParent , ::oParent ) @@ -334,8 +321,6 @@ METHOD WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible RETURN Self -// - METHOD WvgWindow:destroy() IF ! Empty( ::oParent ) @@ -424,22 +409,16 @@ METHOD WvgWindow:destroy() RETURN NIL -// - METHOD WvgWindow:SetWindowProcCallback() ::nOldProc := WVG_SetWindowProcBlock( ::pWnd, {| h, m, w, l | ::ControlWndProc( h, m, w, l ) } ) RETURN Self -// - METHOD WvgWindow:captureMouse() RETURN Self -// - METHOD WvgWindow:disable() IF WVG_EnableWindow( ::hWnd, .F. ) @@ -449,8 +428,6 @@ METHOD WvgWindow:disable() RETURN .F. -// - METHOD WvgWindow:enable() IF WVG_EnableWindow( ::hWnd, .T. ) @@ -460,8 +437,6 @@ METHOD WvgWindow:enable() RETURN .F. -// - METHOD WvgWindow:hide() IF WVG_IsWindow( ::hWnd ) @@ -471,26 +446,18 @@ 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 @@ -512,26 +479,18 @@ 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 @@ -553,15 +512,10 @@ METHOD WvgWindow:setPos( aPos, lPaint ) RETURN Self -// - /* This will always be called from HB_GTE_RESIZED message of WVG engine */ - -METHOD WvgWindow:rePosition() +METHOD WvgWindow:rePosition() /* This will always be called from HB_GTE_RESIZED message of WVG engine */ RETURN ::setPosAndSize( ::aPos, ::aSize ) -// - METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) LOCAL aPosSz @@ -586,8 +540,6 @@ METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) RETURN Self -// - METHOD WvgWindow:setSize( aSize, lPaint ) LOCAL aPosSz @@ -609,8 +561,6 @@ METHOD WvgWindow:setSize( aSize, lPaint ) RETURN Self -// - METHOD WvgWindow:isDerivedFrom( cClassORoObject ) LOCAL lTrue := .F. @@ -631,8 +581,6 @@ METHOD WvgWindow:isDerivedFrom( cClassORoObject ) RETURN lTrue -// - METHOD WvgWindow:show() WVG_ShowWindow( ::hWnd, SW_NORMAL ) @@ -641,40 +589,28 @@ 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 @@ -714,22 +650,16 @@ 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 @@ -738,28 +668,18 @@ 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 ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_enter ) @@ -774,8 +694,6 @@ METHOD WvgWindow:enter( xParam ) RETURN Self -// - METHOD WvgWindow:leave( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_leave ) @@ -790,8 +708,6 @@ METHOD WvgWindow:leave( xParam ) RETURN Self -// - METHOD WvgWindow:lbClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbClick ) @@ -806,8 +722,6 @@ METHOD WvgWindow:lbClick( xParam ) RETURN Self -// - METHOD WvgWindow:lbDblClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbDblClick ) @@ -822,8 +736,6 @@ METHOD WvgWindow:lbDblClick( xParam ) RETURN Self -// - METHOD WvgWindow:lbDown( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbDown ) @@ -838,8 +750,6 @@ METHOD WvgWindow:lbDown( xParam ) RETURN Self -// - METHOD WvgWindow:lbUp( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_lbUp ) @@ -854,8 +764,6 @@ METHOD WvgWindow:lbUp( xParam ) RETURN Self -// - METHOD WvgWindow:mbClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbClick ) @@ -870,8 +778,6 @@ METHOD WvgWindow:mbClick( xParam ) RETURN Self -// - METHOD WvgWindow:mbDblClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbDblClick ) @@ -886,8 +792,6 @@ METHOD WvgWindow:mbDblClick( xParam ) RETURN Self -// - METHOD WvgWindow:mbDown( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbDown ) @@ -902,8 +806,6 @@ METHOD WvgWindow:mbDown( xParam ) RETURN Self -// - METHOD WvgWindow:mbUp( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_mbUp ) @@ -918,8 +820,6 @@ METHOD WvgWindow:mbUp( xParam ) RETURN Self -// - METHOD WvgWindow:motion( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_motion ) @@ -934,8 +834,6 @@ METHOD WvgWindow:motion( xParam ) RETURN Self -// - METHOD WvgWindow:rbClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbClick ) @@ -950,8 +848,6 @@ METHOD WvgWindow:rbClick( xParam ) RETURN Self -// - METHOD WvgWindow:rbDblClick( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbDblClick ) @@ -966,8 +862,6 @@ METHOD WvgWindow:rbDblClick( xParam ) RETURN Self -// - METHOD WvgWindow:rbDown( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbDown ) @@ -982,8 +876,6 @@ METHOD WvgWindow:rbDown( xParam ) RETURN Self -// - METHOD WvgWindow:rbUp( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_rbUp ) @@ -998,8 +890,6 @@ METHOD WvgWindow:rbUp( xParam ) RETURN Self -// - METHOD WvgWindow:wheel( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_wheel ) @@ -1014,10 +904,6 @@ METHOD WvgWindow:wheel( xParam ) RETURN Self -// -// Other Messages -// - METHOD WvgWindow:close( xParam ) if ::objType == objTypeCrt @@ -1034,8 +920,6 @@ METHOD WvgWindow:close( xParam ) RETURN Self -// - METHOD WvgWindow:helpRequest( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_helpRequest ) @@ -1050,8 +934,6 @@ METHOD WvgWindow:helpRequest( xParam ) RETURN Self -// - METHOD WvgWindow:keyboard( xParam ) IF HB_ISNUMERIC( xParam ) .AND. HB_ISBLOCK( ::sl_keyboard ) @@ -1066,8 +948,6 @@ METHOD WvgWindow:keyboard( xParam ) RETURN Self -// - METHOD WvgWindow:killDisplayFocus( xParam ) if ::objType == objTypeCrt @@ -1084,8 +964,6 @@ METHOD WvgWindow:killDisplayFocus( xParam ) RETURN Self -// - METHOD WvgWindow:killInputFocus( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_killInputFocus ) @@ -1100,8 +978,6 @@ METHOD WvgWindow:killInputFocus( xParam ) RETURN Self -// - METHOD WvgWindow:move( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_move ) @@ -1116,8 +992,6 @@ METHOD WvgWindow:move( xParam ) RETURN Self -// - METHOD WvgWindow:paint( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_paint ) @@ -1132,8 +1006,6 @@ METHOD WvgWindow:paint( xParam ) RETURN Self -// - METHOD WvgWindow:quit( xParam, xParam1 ) IF HB_ISNUMERIC( xParam ) .AND. HB_ISBLOCK( ::sl_quit ) @@ -1148,8 +1020,6 @@ METHOD WvgWindow:quit( xParam, xParam1 ) RETURN Self -// - METHOD WvgWindow:resize( xParam, xParam1 ) IF HB_ISARRAY( xParam ) .AND. HB_ISARRAY( xParam1 ) .AND. HB_ISBLOCK( ::sl_resize ) @@ -1164,8 +1034,6 @@ METHOD WvgWindow:resize( xParam, xParam1 ) RETURN Self -// - METHOD WvgWindow:setDisplayFocus( xParam ) if ::objType == objTypeCrt @@ -1182,8 +1050,6 @@ METHOD WvgWindow:setDisplayFocus( xParam ) RETURN Self -// - METHOD WvgWindow:setInputFocus( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_setInputFocus ) @@ -1198,8 +1064,6 @@ METHOD WvgWindow:setInputFocus( xParam ) RETURN Self -// - METHOD WvgWindow:dragEnter( xParam, xParam1 ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_dragEnter ) @@ -1214,8 +1078,6 @@ METHOD WvgWindow:dragEnter( xParam, xParam1 ) RETURN Self -// - METHOD WvgWindow:dragMotion( xParam ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_dragMotion ) @@ -1230,8 +1092,6 @@ METHOD WvgWindow:dragMotion( xParam ) RETURN Self -// - METHOD WvgWindow:dragLeave( xParam ) IF HB_ISNIL( xParam ) .AND. HB_ISBLOCK( ::sl_dragLeave ) @@ -1246,8 +1106,6 @@ METHOD WvgWindow:dragLeave( xParam ) RETURN Self -// - METHOD WvgWindow:dragDrop( xParam, xParam1 ) IF HB_ISARRAY( xParam ) .AND. HB_ISBLOCK( ::sl_dragDrop ) @@ -1262,8 +1120,6 @@ METHOD WvgWindow:dragDrop( xParam, xParam1 ) RETURN Self -// - METHOD WvgWindow:Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) __defaultNIL( @oParent , ::oParent ) @@ -1282,22 +1138,16 @@ 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 @@ -1310,8 +1160,6 @@ METHOD WvgWindow:findObjectByHandle( hWnd ) RETURN NIL -// - METHOD WvgWindow:getPosAndSize( aPs, aSz ) LOCAL nX, nY, nW, nH, aXY @@ -1364,8 +1212,6 @@ METHOD WvgWindow:getPosAndSize( aPs, aSz ) RETURN { aPos[ 1 ], aPos[ 2 ], aSize[ 1 ], aSize[ 2 ] } -// - METHOD WvgWindow:toolTipText( cText ) IF HB_ISSTRING( cText ) @@ -1377,8 +1223,6 @@ METHOD WvgWindow:toolTipText( cText ) RETURN ::s_toolTipText -// - METHOD WvgWindow:createControl() LOCAL hWnd, aPosSz @@ -1388,15 +1232,15 @@ METHOD WvgWindow:createControl() aPosSz := ::getPosAndSize( ::aPos, ::aSize ) hWnd := WVG_CreateWindowEx( ::exStyle, ; - ::className, ; - "", ; /* window name */ - ::style, ; - aPosSz[ 1 ], aPosSz[ 2 ], ; - aPosSz[ 3 ], aPosSz[ 4 ], ; - ::oParent:hWnd, ; - ::nID, ; /* hMenu */ - NIL, ; /* hInstance */ - NIL ) /* lParam */ + ::className, ; + "", ; /* window name */ + ::style, ; + aPosSz[ 1 ], aPosSz[ 2 ], ; + aPosSz[ 3 ], aPosSz[ 4 ], ; + ::oParent:hWnd, ; + ::nID, ; /* hMenu */ + NIL, ; /* hInstance */ + NIL ) /* lParam */ IF WVG_IsWindow( hWnd ) ::hWnd := hWnd ::pWnd := WIN_N2P( hWnd ) @@ -1405,5 +1249,3 @@ METHOD WvgWindow:createControl() ENDIF RETURN Self - -// diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index c3c1124a87..f9be6a0998 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -5,7 +5,7 @@ /* * Harbour Project source code: * - * Copyright 2007 Pritpal Bedi + * Copyright 2007-2012 Pritpal Bedi * Based on: * * Video subsystem for Windows using GUI windows instead of Console @@ -66,7 +66,7 @@ /* * GUI Drawing Functions - * Pritpal Bedi + * Pritpal Bedi */ #include "hbwinole.h" diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/harbour/contrib/gtwvg/wvgcuig.c index fcf632469e..6f83a43bdf 100644 --- a/harbour/contrib/gtwvg/wvgcuig.c +++ b/harbour/contrib/gtwvg/wvgcuig.c @@ -5,7 +5,7 @@ /* * Harbour Project source code: * - * Copyright 2009 Pritpal Bedi + * Copyright 2009-2012 Pritpal Bedi * Based on: * * Video subsystem for Windows using GUI windows instead of Console @@ -73,7 +73,7 @@ * No Callbacks etc. * Pure Statics * . - * Pritpal Bedi + * Pritpal Bedi * 28Feb2009 */ diff --git a/harbour/contrib/gtwvg/wvgparts.ch b/harbour/contrib/gtwvg/wvgparts.ch index 1ac236d5e9..680ec800db 100644 --- a/harbour/contrib/gtwvg/wvgparts.ch +++ b/harbour/contrib/gtwvg/wvgparts.ch @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for the WVT*Classes * - * Copyright 2008 Pritpal Bedi + * Copyright 2008-2012 Pritpal Bedi * www - http://www.xharbour.org http://harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index 2e1d5975e1..bdcf184f8b 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Video subsystem for Windows using GUI windows instead of Console * - * Copyright 2007 Pritpal Bedi + * Copyright 2007-2012 Pritpal Bedi * based on: * * Copyright 2003 Peter Rees @@ -105,7 +105,7 @@ static HINSTANCE wvg_hInstance( void ) } /* - * Pritpal Bedi + * Pritpal Bedi */ HB_FUNC( WVT_UTILS ) diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index 8f5524eed1..970ec3f2ab 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Video subsystem for Windows using GUI windows instead of Console * - * Copyright 2007 Pritpal Bedi + * Copyright 2007-2012 Pritpal Bedi * based on: * * Copyright 2003 Peter Rees diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index 60680416b3..708a470cf1 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -6,7 +6,7 @@ * Harbour Project source code: * Video subsystem for Windows using GUI windows instead of Console * - * Copyright 2007 Pritpal Bedi + * Copyright 2007-2012 Pritpal Bedi * based on: * * Copyright 2003 Peter Rees