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

2012-10-15 15:21 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/hbformat/hbfmtcls.prg
    * new TOFIX:
       "end class" is converted to "end CLASS" instead of "END CLASS"

  * 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/htmlview.prg
  * contrib/gtwvg/listbox.prg
  * contrib/gtwvg/menubar.prg
  * contrib/gtwvg/mle.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/hbgd/gdbarcod.prg
  * contrib/hbgd/gdchart.prg
  * contrib/hbgd/gdimage.prg
  * contrib/hbtip/client.prg
  * contrib/hbtip/url.prg
  * contrib/xhb/hblog.prg
  * contrib/xhb/hblognet.prg
  * contrib/xhb/hjwindow.prg
  * contrib/xhb/htjlist.prg
  * contrib/xhb/htmutil.prg
  * contrib/xhb/tcgi.prg
  * contrib/xhb/tfile.prg
  * contrib/xhb/trpc.prg
  * contrib/xhb/trpccli.prg
  * contrib/xhb/ttable.prg
  * contrib/xhb/txml.prg
  * contrib/xhb/xhbtedit.prg
  * doc/clipper.txt
  * doc/en/command.txt
  * doc/en/objfunc.txt
  * extras/gtwvw/tests/drawimg.prg
  * extras/gtwvw/tests/wvwmouse.prg
  * extras/hbdoc/genbase.prg
  * extras/hbdoc/genhtml.prg
  * extras/hbdoc/gentxt.prg
  * extras/hbdoc/tmplates.prg
  * extras/httpsrv/cookie.prg
  * extras/httpsrv/modules/tableservletdb.prg
  * extras/httpsrv/session.prg
  * tests/testdecl.prg
    * changed code to use Class(y) OOP syntax
      DATA -> VAR, CLASSDATA -> CLASS VAR, CLASS -> CREATE CLASS
      (except ENDCLASS -> END CLASS, because hbformat doesn't
      recognize it yet)
This commit is contained in:
Viktor Szakats
2012-10-15 13:23:56 +00:00
parent 943832d763
commit 3d6a1e51a2
58 changed files with 940 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
harbour/ChangeLog
View File

@@ -16,6 +16,72 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-15 15:21 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbformat/hbfmtcls.prg
* new TOFIX:
"end class" is converted to "end CLASS" instead of "END CLASS"
* 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/htmlview.prg
* contrib/gtwvg/listbox.prg
* contrib/gtwvg/menubar.prg
* contrib/gtwvg/mle.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/hbgd/gdbarcod.prg
* contrib/hbgd/gdchart.prg
* contrib/hbgd/gdimage.prg
* contrib/hbtip/client.prg
* contrib/hbtip/url.prg
* contrib/xhb/hblog.prg
* contrib/xhb/hblognet.prg
* contrib/xhb/hjwindow.prg
* contrib/xhb/htjlist.prg
* contrib/xhb/htmutil.prg
* contrib/xhb/tcgi.prg
* contrib/xhb/tfile.prg
* contrib/xhb/trpc.prg
* contrib/xhb/trpccli.prg
* contrib/xhb/ttable.prg
* contrib/xhb/txml.prg
* contrib/xhb/xhbtedit.prg
* doc/clipper.txt
* doc/en/command.txt
* doc/en/objfunc.txt
* extras/gtwvw/tests/drawimg.prg
* extras/gtwvw/tests/wvwmouse.prg
* extras/hbdoc/genbase.prg
* extras/hbdoc/genhtml.prg
* extras/hbdoc/gentxt.prg
* extras/hbdoc/tmplates.prg
* extras/httpsrv/cookie.prg
* extras/httpsrv/modules/tableservletdb.prg
* extras/httpsrv/session.prg
* tests/testdecl.prg
* changed code to use Class(y) OOP syntax
DATA -> VAR, CLASSDATA -> CLASS VAR, CLASS -> CREATE CLASS
(except ENDCLASS -> END CLASS, because hbformat doesn't
recognize it yet)
2012-10-15 16:20 UTC+0300 Alexander Kresin <alex at belacy.belgorod.su>
* harbour/src/rtl/gtwvt/gtwvt.c
! Handling of K_ALT_COMMA and K_ALT_PERIOD has been added.

10
harbour/contrib/gtwvg/3state.prg
View File

@@ -82,12 +82,12 @@
//
CLASS Wvg3State INHERIT WvgWindow, WvgDataRef
CREATE CLASS Wvg3State INHERIT WvgWindow, WvgDataRef
DATA autosize INIT .F.
DATA caption INIT ""
DATA pointerFocus INIT .T.
DATA selection INIT .F.
VAR autosize INIT .F.
VAR caption INIT ""
VAR pointerFocus INIT .T.
VAR selection INIT .F.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

28
harbour/contrib/gtwvg/activex.prg
View File

@@ -83,25 +83,25 @@
//
CLASS WvgActiveXControl FROM WvgWindow
CREATE CLASS WvgActiveXControl FROM WvgWindow
DATA oOLE
DATA CLSID INIT ""
DATA server INIT NIL
DATA license INIT NIL
DATA controlFlags INIT 0
DATA DEFAULT INIT .F.
DATA cancel INIT .F.
VAR oOLE
VAR CLSID INIT ""
VAR server INIT NIL
VAR license INIT NIL
VAR controlFlags INIT 0
VAR DEFAULT INIT .F.
VAR cancel INIT .F.
DATA interface
DATA interfaceName
VAR interface
VAR interfaceName
DATA lSubStdEvents INIT .F.
VAR lSubStdEvents INIT .F.
DATA hEvents INIT { => }
DATA hContainer
VAR hEvents INIT { => }
VAR hContainer
DATA ClassName
VAR ClassName
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible, cCLSID, cLicense )

20
harbour/contrib/gtwvg/bitmap.prg
View File

@@ -82,18 +82,18 @@
//
CLASS WvgBitmap
CREATE CLASS WvgBitmap
DATA bits INIT 0 READONLY
DATA bufferOffset INIT 0 READONLY
DATA planes INIT 0 READONLY
DATA transparentClr INIT 0
DATA xSize INIT 0 READONLY
DATA ySize INIT 0 READONLY
VAR bits INIT 0 READONLY
VAR bufferOffset INIT 0 READONLY
VAR planes INIT 0 READONLY
VAR transparentClr INIT 0
VAR xSize INIT 0 READONLY
VAR ySize INIT 0 READONLY
DATA hBitmap
DATA hDCcompat
DATA lDCToDestroy INIT .F.
VAR hBitmap
VAR hDCcompat
VAR lDCToDestroy INIT .F.
METHOD new()
METHOD create( oPScompat )

10
harbour/contrib/gtwvg/checkbox.prg
View File

@@ -76,12 +76,12 @@
//
CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef
DATA autosize INIT .F.
DATA caption INIT ""
DATA pointerFocus INIT .T.
DATA selection INIT .F.
VAR autosize INIT .F.
VAR caption INIT ""
VAR pointerFocus INIT .T.
VAR selection INIT .F.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

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

@@ -105,7 +105,7 @@
*/
//
CLASS wvtDialog
CREATE CLASS wvtDialog
/* To hold previous settings */
VAR nOldRows
@@ -740,7 +740,7 @@ METHOD wvtDialog:ActivateMenu()
//
//
CLASS WvtObject
CREATE CLASS WvtObject
VAR oParent
VAR nType
@@ -1015,7 +1015,7 @@ METHOD WvtObject:ShowPopup()
//
//
CLASS WvtBrowse FROM WvtObject
CREATE CLASS WvtBrowse FROM WvtObject
VAR cAlias
VAR oBrw
@@ -1326,7 +1326,7 @@ METHOD WvtBrowse:PaintBlock( nPaintObj )
//
//
CLASS WvtStatusBar FROM WvtObject
CREATE CLASS WvtStatusBar FROM WvtObject
VAR aPanels
VAR cColor
@@ -1483,7 +1483,7 @@ METHOD WvtStatusBar:Refresh()
//
//
CLASS WvtPanel FROM WvtObject
CREATE CLASS WvtPanel FROM WvtObject
VAR cColor
VAR cTxt
@@ -1525,7 +1525,7 @@ METHOD WvtPanel:Refresh()
//
//
CLASS WvtLabel FROM WvtObject
CREATE CLASS WvtLabel FROM WvtObject
ACCESS TEXT INLINE iif( ::cText == nil, "", ::cText )
ASSIGN TEXT( cTxt ) INLINE ::cText := iif( cTxt == nil, "", cTxt )
@@ -1688,7 +1688,7 @@ METHOD WvtLabel:HoverOff()
//
//
CLASS WvtToolBar FROM WvtObject
CREATE CLASS WvtToolBar FROM WvtObject
VAR nPaintID
VAR aObjects INIT {}
@@ -1851,7 +1851,7 @@ METHOD WvtToolBar:HoverOff()
//
//
CLASS WvtToolButton FROM WvtObject
CREATE CLASS WvtToolButton FROM WvtObject
VAR cFileImage
VAR nCurState INIT 0
@@ -1974,7 +1974,7 @@ METHOD WvtToolButton:HoverOff()
//
//
CLASS WvtImage FROM WvtObject
CREATE CLASS WvtImage FROM WvtObject
VAR cImageFile
@@ -2030,7 +2030,7 @@ METHOD WvtImage:SetImage( cImage )
//
//
CLASS WvtStatic FROM WvtObject
CREATE CLASS WvtStatic FROM WvtObject
VAR nStatic
VAR nOrient
@@ -2178,7 +2178,7 @@ METHOD WvtStatic:Refresh()
//
//
CLASS WvtPushButton FROM WvtObject
CREATE CLASS WvtPushButton FROM WvtObject
VAR cCaption
VAR cFileImage
@@ -2255,7 +2255,7 @@ METHOD WvtPushButton:LeftUp()
//
//
CLASS WvtGets FROM WvtObject
CREATE CLASS WvtGets FROM WvtObject
VAR aGetList INIT {}
VAR nLastGet INIT 1
@@ -2410,7 +2410,7 @@ METHOD WvtGets:DeHilite()
//
//
CLASS WvtScrollBar FROM WvtObject
CREATE CLASS WvtScrollBar FROM WvtObject
VAR nBarType INIT WVT_SCROLLBAR_VERT
@@ -2953,7 +2953,7 @@ METHOD wvtScrollbar:HandleEvent( nKey )
//
//
CLASS WvtBanner FROM WvtObject
CREATE CLASS WvtBanner FROM WvtObject
VAR nTimeDelay INIT 0.5 /* One-half Second */
VAR nDirection INIT 0 /* LEFT 1-RIGHT */
@@ -3125,7 +3125,7 @@ METHOD WvtBanner:HoverOff()
//
//
CLASS WvtTextBox FROM WvtObject
CREATE CLASS WvtTextBox FROM WvtObject
VAR cText INIT ""
@@ -3226,7 +3226,7 @@ METHOD WvtTextBox:HoverOff( /*cText*/ )
//
//
CLASS WvtProgressBar FROM WvtObject
CREATE CLASS WvtProgressBar FROM WvtObject
VAR cImage
VAR nDirection INIT 0 /* 0-Left-Right,Top-Bottom 1-Right-Left,Bottom-Top */
@@ -3334,7 +3334,7 @@ METHOD WvtProgressBar:DeActivate()
//
//
CLASS wvtMenu
CREATE CLASS wvtMenu
METHOD create( cCaption )
METHOD AddItem( cCaption, bAction )
@@ -3348,7 +3348,7 @@ CLASS wvtMenu
METHOD FindMenuItemById( nId )
METHOD DrawMenuBar()
CLASSVAR MenuItemId INIT 1
CLASS VAR MenuItemId INIT 1
VAR aItems
VAR hMenu
@@ -3537,7 +3537,7 @@ METHOD wvtMenu:DrawMenuBar()
//
//
CLASS WvtConsole FROM WvtObject
CREATE CLASS WvtConsole FROM WvtObject
METHOD New( oParent )
METHOD Say( nRow, nCol, xExp, cColor )
@@ -3615,7 +3615,7 @@ METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor )
//
CLASS TBrowseWVG FROM TBrowse
CREATE CLASS TBrowseWVG FROM TBrowse
VAR aColumnsSep INIT {}

20
harbour/contrib/gtwvg/combobox.prg
View File

@@ -76,13 +76,13 @@
//
CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef
DATA TYPE INIT WVGCOMBO_DROPDOWN
DATA drawMode INIT WVG_DRAW_NORMAL
DATA nCurSelected INIT 0
VAR TYPE INIT WVGCOMBO_DROPDOWN
VAR drawMode INIT WVG_DRAW_NORMAL
VAR nCurSelected INIT 0
DATA aInfo INIT NIL
VAR aInfo INIT NIL
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -103,14 +103,14 @@ CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef
METHOD setItem( nIndex, cItem ) VIRTUAL
METHOD setIcon( nItem, cIcon )
DATA oSLE
DATA oListBox
VAR oSLE
VAR oListBox
ACCESS XbpSLE INLINE ::oSLE
ACCESS XbpListBox INLINE ::oListBox
DATA sl_itemMarked
DATA sl_itemSelected
DATA sl_drawItem
VAR sl_itemMarked
VAR sl_itemSelected
VAR sl_drawItem
METHOD itemMarked( ... ) SETGET
METHOD itemSelected( ... ) SETGET

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

@@ -76,103 +76,103 @@
//
CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
DATA oMenu
VAR oMenu
/* CONFIGURATION */
DATA alwaysOnTop INIT .F. /* Determines whether the dialog can be covered by other windows */
DATA border INIT 0 /* Border type for the XbpCrt window */
DATA clipChildren INIT .F.
DATA closable INIT .T.
DATA fontHeight INIT 16
DATA fontWidth INIT 10
DATA fontName INIT "Courier New"
DATA gridMove INIT .F.
DATA icon INIT 0
DATA minMax INIT .T.
DATA sysMenu INIT .T.
DATA taskList INIT .T.
DATA title INIT " "
DATA titleBar INIT .T.
DATA visible INIT .T.
VAR alwaysOnTop INIT .F. /* Determines whether the dialog can be covered by other windows */
VAR border INIT 0 /* Border type for the XbpCrt window */
VAR clipChildren INIT .F.
VAR closable INIT .T.
VAR fontHeight INIT 16
VAR fontWidth INIT 10
VAR fontName INIT "Courier New"
VAR gridMove INIT .F.
VAR icon INIT 0
VAR minMax INIT .T.
VAR sysMenu INIT .T.
VAR taskList INIT .T.
VAR title INIT " "
VAR titleBar INIT .T.
VAR visible INIT .T.
DATA autoFocus INIT .T.
DATA autoMark INIT .T.
DATA dropFont INIT .T.
DATA dropZone INIT .F.
DATA helpLink INIT NIL
DATA maxCol INIT 79
DATA maxRow INIT 24
DATA mouseMode INIT 1 /* Determines whether mouse coordinates are given as graphics or text coordinates.*/
DATA modalResult INIT NIL /* Specifies the result of a modal dialog. */
DATA aSyncFlush INIT .F. /* Determines the display behavior of text-mode output. */
DATA tooltipText INIT ""
DATA useShortCuts INIT .F. /* Enables shortcut keys for the system menu */
DATA xSize INIT 640 READONLY
DATA ySize INIT 400 READONLY
VAR autoFocus INIT .T.
VAR autoMark INIT .T.
VAR dropFont INIT .T.
VAR dropZone INIT .F.
VAR helpLink INIT NIL
VAR maxCol INIT 79
VAR maxRow INIT 24
VAR mouseMode INIT 1 /* Determines whether mouse coordinates are given as graphics or text coordinates.*/
VAR modalResult INIT NIL /* Specifies the result of a modal dialog. */
VAR aSyncFlush INIT .F. /* Determines the display behavior of text-mode output. */
VAR tooltipText INIT ""
VAR useShortCuts INIT .F. /* Enables shortcut keys for the system menu */
VAR xSize INIT 640 READONLY
VAR ySize INIT 400 READONLY
/* GUI Specifics */
DATA animate INIT .F.
DATA clipParent INIT .F.
DATA clipSiblings INIT .T.
DATA group INIT 0 /* XBP_NO_GROUP */
DATA sizeRedraw INIT .F.
DATA tabStop INIT .F.
VAR animate INIT .F.
VAR clipParent INIT .F.
VAR clipSiblings INIT .T.
VAR group INIT 0 /* XBP_NO_GROUP */
VAR sizeRedraw INIT .F.
VAR tabStop INIT .F.
/* CALLBACK SLOTS */
DATA sl_enter
DATA sl_leave
DATA sl_lbClick
DATA sl_lbDblClick
DATA sl_lbDown
DATA sl_lbUp
DATA sl_mbClick
DATA sl_mbDblClick
DATA sl_mbDown
DATA sl_mbUp
DATA sl_motion
DATA sl_rbClick
DATA sl_rbDblClick
DATA sl_rbDown
DATA sl_rbUp
DATA sl_wheel
VAR sl_enter
VAR sl_leave
VAR sl_lbClick
VAR sl_lbDblClick
VAR sl_lbDown
VAR sl_lbUp
VAR sl_mbClick
VAR sl_mbDblClick
VAR sl_mbDown
VAR sl_mbUp
VAR sl_motion
VAR sl_rbClick
VAR sl_rbDblClick
VAR sl_rbDown
VAR sl_rbUp
VAR sl_wheel
DATA sl_close
DATA sl_helpRequest
DATA sl_keyboard
DATA sl_killDisplayFocus /* only for CRT */
DATA sl_killInputFocus
DATA sl_move
DATA sl_paint /* only for gui dialogs */
DATA sl_quit
DATA sl_resize
DATA sl_setDisplayFocus /* only for CRT */
DATA sl_setInputFocus
DATA sl_dragEnter
DATA sl_dragMotion
DATA sl_dragLeave
DATA sl_dragDrop
VAR sl_close
VAR sl_helpRequest
VAR sl_keyboard
VAR sl_killDisplayFocus /* only for CRT */
VAR sl_killInputFocus
VAR sl_move
VAR sl_paint /* only for gui dialogs */
VAR sl_quit
VAR sl_resize
VAR sl_setDisplayFocus /* only for CRT */
VAR sl_setInputFocus
VAR sl_dragEnter
VAR sl_dragMotion
VAR sl_dragLeave
VAR sl_dragDrop
/* HARBOUR implementation */
DATA resizable INIT .T.
DATA resizeMode INIT HB_GTI_RESIZEMODE_FONT
DATA style INIT ( WS_OVERLAPPED + WS_CAPTION + WS_SYSMENU + WS_SIZEBOX + WS_MINIMIZEBOX + WS_MAXIMIZEBOX )
DATA exStyle INIT 0
DATA lModal INIT .F.
DATA pGTp
DATA pGT
DATA objType INIT objTypeCrt
DATA ClassName INIT "WVGCRT"
DATA drawingArea
DATA hWnd
DATA aPos INIT { 0, 0 }
DATA aSize INIT { 24, 79 }
DATA aPresParams INIT {}
DATA lHasInputFocus INIT .F.
DATA nFrameState INIT 0 /* normal */
VAR resizable INIT .T.
VAR resizeMode INIT HB_GTI_RESIZEMODE_FONT
VAR style INIT ( WS_OVERLAPPED + WS_CAPTION + WS_SYSMENU + WS_SIZEBOX + WS_MINIMIZEBOX + WS_MAXIMIZEBOX )
VAR exStyle INIT 0
VAR lModal INIT .F.
VAR pGTp
VAR pGT
VAR objType INIT objTypeCrt
VAR ClassName INIT "WVGCRT"
VAR drawingArea
VAR hWnd
VAR aPos INIT { 0, 0 }
VAR aSize INIT { 24, 79 }
VAR aPresParams INIT {}
VAR lHasInputFocus INIT .F.
VAR nFrameState INIT 0 /* normal */
DATA isGT INIT .F.
VAR isGT INIT .F.
METHOD setTitle( cTitle ) INLINE ::title := cTitle, hb_gtInfo( HB_GTI_WINTITLE, cTitle )
METHOD getTitle() INLINE hb_gtInfo( HB_GTI_WINTITLE )

18
harbour/contrib/gtwvg/dataref.prg
View File

@@ -76,19 +76,19 @@
//
CLASS WvgDataRef
CREATE CLASS WvgDataRef
DATA changed INIT .F.
DATA dataLink INIT NIL
DATA lastValid INIT .T.
DATA sl_undo INIT NIL
DATA undoBuffer INIT NIL
DATA sl_validate INIT NIL
VAR changed INIT .F.
VAR dataLink INIT NIL
VAR lastValid INIT .T.
VAR sl_undo INIT NIL
VAR undoBuffer INIT NIL
VAR sl_validate INIT NIL
METHOD new()
DATA sl_editBuffer
DATA sl_buffer
VAR sl_editBuffer
VAR sl_buffer
ACCESS editBuffer INLINE ::sl_editBuffer
ASSIGN editBuffer( xData ) INLINE ::sl_editBuffer := xData

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

@@ -76,12 +76,12 @@
//
CLASS WvgDialog FROM WvgWindow
CREATE CLASS WvgDialog FROM WvgWindow
DATA oMenu
DATA aRect
DATA drawingArea
DATA tasklist INIT .T.
VAR oMenu
VAR aRect
VAR drawingArea
VAR tasklist INIT .T.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

8
harbour/contrib/gtwvg/drawarea.prg
View File

@@ -76,11 +76,11 @@
//
CLASS WvgDrawingArea INHERIT WvgWindow
CREATE CLASS WvgDrawingArea INHERIT WvgWindow
DATA caption INIT ""
DATA clipParent INIT .T.
DATA clipSiblings INIT .T.
VAR caption INIT ""
VAR clipParent INIT .T.
VAR clipSiblings INIT .T.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

16
harbour/contrib/gtwvg/htmlview.prg
View File

@@ -94,7 +94,7 @@
//
CLASS WvgHTMLViewer INHERIT WvgActiveXControl
CREATE CLASS WvgHTMLViewer INHERIT WvgActiveXControl
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -113,31 +113,31 @@ CLASS WvgHTMLViewer INHERIT WvgActiveXControl
METHOD search() INLINE ::goSearch()
METHOD isBusy() INLINE ::busy()
DATA sl_beforeNavigate PROTECTED
VAR sl_beforeNavigate PROTECTED
ACCESS beforeNavigate INLINE ::sl_beforeNavigate
ASSIGN beforeNavigate( bBlock ) INLINE ::sl_beforeNavigate := bBlock
DATA sl_navigateComplete PROTECTED
VAR sl_navigateComplete PROTECTED
ACCESS navigateComplete INLINE ::sl_navigateComplete
ASSIGN navigateComplete( bBlock ) INLINE ::sl_navigateComplete := bBlock
DATA sl_statusTextChange PROTECTED
VAR sl_statusTextChange PROTECTED
ACCESS statusTextChange INLINE ::sl_statusTextChange
ASSIGN statusTextChange( bBlock ) INLINE ::sl_statusTextChange := bBlock
DATA sl_progressChange PROTECTED
VAR sl_progressChange PROTECTED
ACCESS progressChange INLINE ::sl_progressChange
ASSIGN progressChange( bBlock ) INLINE ::sl_progressChange := bBlock
DATA sl_titleChange PROTECTED
VAR sl_titleChange PROTECTED
ACCESS titleChange INLINE ::sl_titleChange
ASSIGN titleChange( bBlock ) INLINE ::sl_titleChange := bBlock
DATA sl_documentComplete PROTECTED
VAR sl_documentComplete PROTECTED
ACCESS documentComplete INLINE ::sl_documentComplete
ASSIGN documentComplete( bBlock ) INLINE ::sl_documentComplete := bBlock
DATA CLSID INIT "Shell.Explorer" PROTECTED
VAR CLSID INIT "Shell.Explorer" PROTECTED
ENDCLASS

28
harbour/contrib/gtwvg/listbox.prg
View File

@@ -76,14 +76,14 @@
//
CLASS WvgListBox INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgListBox INHERIT WvgWindow, WvgDataRef
DATA adjustHeight INIT .F.
DATA horizScroll INIT .F.
DATA markMode INIT WVGLISTBOX_MM_SINGLE
DATA multiColumn INIT .F.
DATA vertScroll INIT .T.
DATA drawMode INIT WVG_DRAW_NORMAL
VAR adjustHeight INIT .F.
VAR horizScroll INIT .F.
VAR markMode INIT WVGLISTBOX_MM_SINGLE
VAR multiColumn INIT .F.
VAR vertScroll INIT .T.
VAR drawMode INIT WVG_DRAW_NORMAL
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -110,31 +110,31 @@ CLASS WvgListBox INHERIT WvgWindow, WvgDataRef
METHOD setTabstops() VIRTUAL
DATA sl_hScroll
VAR sl_hScroll
ACCESS hScroll INLINE ::sl_hScroll
ASSIGN hScroll( bBlock ) INLINE ::sl_hScroll := bBlock
DATA sl_vScroll
VAR sl_vScroll
ACCESS vScroll INLINE ::sl_vScroll
ASSIGN vScroll( bBlock ) INLINE ::sl_vScroll := bBlock
DATA sl_itemMarked
VAR sl_itemMarked
ACCESS itemMarked INLINE ::sl_itemMarked
ASSIGN itemMarked( bBlock ) INLINE ::sl_itemMarked := bBlock
DATA sl_itemSelected
VAR sl_itemSelected
ACCESS itemSelected INLINE ::sl_itemSelected
ASSIGN itemSelected( bBlock ) INLINE ::sl_itemSelected := bBlock
DATA sl_drawItem
VAR sl_drawItem
ACCESS drawItem INLINE ::sl_drawItem
ASSIGN drawItem( bBlock ) INLINE ::sl_drawItem := bBlock
DATA sl_measureItem
VAR sl_measureItem
ACCESS measureItem INLINE ::sl_measureItem
ASSIGN measureItem( bBlock ) INLINE ::sl_measureItem := bBlock
DATA nCurSelected INIT 0
VAR nCurSelected INIT 0
METHOD getCurItem() INLINE ::getItem( ::nCurSelected )
ENDCLASS

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

@@ -76,30 +76,30 @@
//
CLASS wvgMenuBar INHERIT wvgWindow
CREATE CLASS wvgMenuBar INHERIT wvgWindow
DATA hMenu
DATA pMenu
VAR hMenu
VAR pMenu
/* Event CallBack Slots */
DATA sl_beginMenu
DATA sl_endMenu
DATA sl_itemMarked
DATA sl_itemSelected
DATA sl_drawItem
DATA sl_measureItem
DATA sl_onMenuKey
VAR sl_beginMenu
VAR sl_endMenu
VAR sl_itemMarked
VAR sl_itemSelected
VAR sl_drawItem
VAR sl_measureItem
VAR sl_onMenuKey
DATA aMenuItems INIT {}
VAR aMenuItems INIT {}
CLASSVAR nMenuItemID INIT 0
DATA nPass INIT 0
CLASS VAR nMenuItemID INIT 0
VAR nPass INIT 0
DATA caption INIT ""
DATA nItemID INIT 0
DATA aIds INIT {}
VAR caption INIT ""
VAR nItemID INIT 0
VAR aIds INIT {}
DATA className INIT "MENUBAR"
VAR className INIT "MENUBAR"
METHOD numItems() INLINE Len( ::aMenuItems )
@@ -587,9 +587,9 @@ METHOD WvgMenuBar:onMenuKey( xParam )
//
//
CLASS wvgMenu INHERIT wvgMenuBar
CREATE CLASS wvgMenu INHERIT wvgMenuBar
DATA title INIT ""
VAR title INIT ""
METHOD new( oParent, aPresParams, lVisible )
METHOD create( oParent, aPresParams, lVisible )

22
harbour/contrib/gtwvg/mle.prg
View File

@@ -82,16 +82,16 @@
//
CLASS WvgMLE INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgMLE INHERIT WvgWindow, WvgDataRef
DATA border INIT .T.
DATA editable INIT .T.
DATA horizScroll INIT .T.
DATA vertScroll INIT .T.
DATA wordWrap INIT .T.
DATA ignoreTab INIT .F.
VAR border INIT .T.
VAR editable INIT .T.
VAR horizScroll INIT .T.
VAR vertScroll INIT .T.
VAR wordWrap INIT .T.
VAR ignoreTab INIT .F.
DATA bufferLength INIT 32000
VAR bufferLength INIT 32000
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -114,18 +114,18 @@ CLASS WvgMLE INHERIT WvgWindow, WvgDataRef
METHOD lineFromChar() VIRTUAL
METHOD pos() VIRTUAL
DATA sl_undo INIT .T.
VAR sl_undo INIT .T.
ACCESS undo INLINE iif( ::sl_undo, NIL, NIL )
ASSIGN undo( lUndo ) INLINE ::sl_undo := lUndo
METHOD setEditable() VIRTUAL
METHOD setWrap() VIRTUAL
DATA sl_hScroll
VAR sl_hScroll
ACCESS hScroll INLINE ::sl_hScroll
ASSIGN hScroll( bBlock ) INLINE ::sl_hScroll := bBlock
DATA sl_vScroll
VAR sl_vScroll
ACCESS vScroll INLINE ::sl_vScroll
ASSIGN vScroll( bBlock ) INLINE ::sl_vScroll := bBlock

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

@@ -76,7 +76,7 @@
//
CLASS WvgPartHandler
CREATE CLASS WvgPartHandler
VAR cargo

18
harbour/contrib/gtwvg/pushbut.prg
View File

@@ -76,16 +76,16 @@
//
CLASS WvgPushButton INHERIT WvgWindow
CREATE CLASS WvgPushButton INHERIT WvgWindow
DATA autosize INIT .F.
DATA border INIT .T.
DATA caption INIT NIL
DATA pointerFocus INIT .T.
DATA preSelect INIT .F.
DATA drawMode INIT WVG_DRAW_NORMAL
DATA DEFAULT INIT .F.
DATA cancel INIT .F.
VAR autosize INIT .F.
VAR border INIT .T.
VAR caption INIT NIL
VAR pointerFocus INIT .T.
VAR preSelect INIT .F.
VAR drawMode INIT WVG_DRAW_NORMAL
VAR DEFAULT INIT .F.
VAR cancel INIT .F.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

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

@@ -82,7 +82,7 @@
//
CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef
VAR autosize INIT .F.
VAR caption INIT ""

16
harbour/contrib/gtwvg/scrollbr.prg
View File

@@ -76,17 +76,17 @@
//
CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef
DATA autoTrack INIT .T.
DATA RANGE INIT { 0, 1 }
DATA scrollBoxSize INIT - 1
DATA TYPE INIT WVGSCROLL_HORIZONTAL
DATA excludeScrollBox INIT .F.
VAR autoTrack INIT .T.
VAR RANGE INIT { 0, 1 }
VAR scrollBoxSize INIT - 1
VAR TYPE INIT WVGSCROLL_HORIZONTAL
VAR excludeScrollBox INIT .F.
DATA sl_xbeSB_Scroll
VAR sl_xbeSB_Scroll
DATA lTracking INIT .F.
VAR lTracking INIT .F.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

24
harbour/contrib/gtwvg/sle.prg
View File

@@ -76,16 +76,16 @@
//
CLASS WvgSLE INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgSLE INHERIT WvgWindow, WvgDataRef
DATA align INIT WVGSLE_LEFT
DATA autoKeyboard INIT .T.
DATA autoSize INIT .F.
DATA autoTab INIT .F.
DATA border INIT .T.
DATA bufferLength INIT 32
DATA editable INIT .T.
DATA unReadable INIT .F.
VAR align INIT WVGSLE_LEFT
VAR autoKeyboard INIT .T.
VAR autoSize INIT .F.
VAR autoTab INIT .F.
VAR border INIT .T.
VAR bufferLength INIT 32
VAR editable INIT .T.
VAR unReadable INIT .F.
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -106,17 +106,17 @@ CLASS WvgSLE INHERIT WvgWindow, WvgDataRef
METHOD setInsertMode( lInsertMode ) VIRTUAL
DATA sl_hScroll
VAR sl_hScroll
ACCESS hScroll INLINE ::sl_hScroll
ASSIGN hScroll( bBlock ) INLINE ::sl_hScroll := bBlock
DATA sl_typeOut
VAR sl_typeOut
ACCESS typeOut INLINE ::sl_typeOut
ASSIGN typeOut( bBlock ) INLINE ::sl_typeOut := bBlock
METHOD changed( lChanged ) SETGET
DATA sl_returnPressed
VAR sl_returnPressed
METHOD returnPressed( ... ) SETGET
ENDCLASS

40
harbour/contrib/gtwvg/statbar.prg
View File

@@ -82,12 +82,12 @@
//
CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */
CREATE CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */
DATA caption INIT ""
DATA sizeGrip INIT .T.
VAR caption INIT ""
VAR sizeGrip INIT .T.
DATA aItems INIT {}
VAR aItems INIT {}
METHOD numItems() INLINE Len( ::aItems )
@@ -334,27 +334,27 @@ METHOD WvgStatusBar:panelDblClick( xParam )
//
//
CLASS WvgStatusBarPanel
CREATE CLASS WvgStatusBarPanel
DATA alignment INIT WVGALIGN_LEFT
DATA autosize INIT WVGSTATUSBAR_AUTOSIZE_NONE
DATA bevel INIT WVGSTATUSBAR_BEVEL_INSET
DATA enabled INIT .T.
DATA INDEX INIT 0
DATA KEY INIT ""
DATA style INIT WVGSTATUSBAR_PANEL_TEXT
DATA sl_caption INIT ""
DATA image INIT NIL
DATA tooltipText INIT ""
DATA visible INIT .T.
DATA left INIT 0
DATA width INIT 0
DATA minWidth INIT 0
VAR alignment INIT WVGALIGN_LEFT
VAR autosize INIT WVGSTATUSBAR_AUTOSIZE_NONE
VAR bevel INIT WVGSTATUSBAR_BEVEL_INSET
VAR enabled INIT .T.
VAR INDEX INIT 0
VAR KEY INIT ""
VAR style INIT WVGSTATUSBAR_PANEL_TEXT
VAR sl_caption INIT ""
VAR image INIT NIL
VAR tooltipText INIT ""
VAR visible INIT .T.
VAR left INIT 0
VAR width INIT 0
VAR minWidth INIT 0
METHOD new( cCaption, nStyle, cKey )
METHOD caption( cCaption ) SETGET
DATA oParent
VAR oParent
ENDCLASS

16
harbour/contrib/gtwvg/static.prg
View File

@@ -76,16 +76,16 @@
//
CLASS WvgStatic INHERIT WvgWindow
CREATE CLASS WvgStatic INHERIT WvgWindow
DATA autoSize INIT .F.
DATA caption INIT ""
DATA clipParent INIT .T.
DATA clipSiblings INIT .F.
DATA options INIT - 1 /* WVGSTATIC_TEXT_LEFT */
DATA TYPE INIT - 1 /* WVGSTATIC_TYPE_TEXT */
VAR autoSize INIT .F.
VAR caption INIT ""
VAR clipParent INIT .T.
VAR clipSiblings INIT .F.
VAR options INIT - 1 /* WVGSTATIC_TEXT_LEFT */
VAR TYPE INIT - 1 /* WVGSTATIC_TYPE_TEXT */
DATA hBitmap
VAR hBitmap
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )

144
harbour/contrib/gtwvg/syswnd.prg
View File

@@ -76,7 +76,7 @@
//
CLASS WvgSysWindow INHERIT WvgPartHandler
CREATE CLASS WvgSysWindow INHERIT WvgPartHandler
METHOD new( oParent, oOwner, aPos )
METHOD create( oParent, oOwner, aPos )
@@ -92,22 +92,22 @@ CLASS WvgSysWindow INHERIT WvgPartHandler
METHOD currentPos()
METHOD currentSize()
DATA aPos INIT { 0, 0 }
VAR aPos INIT { 0, 0 }
DATA hWnd PROTECTED
DATA nOldProc PROTECTED
DATA nWndProc PROTECTED
VAR hWnd PROTECTED
VAR nOldProc PROTECTED
VAR nWndProc PROTECTED
DATA sl_helpRequest
VAR sl_helpRequest
ACCESS helpRequest INLINE ::sl_helpRequest
ASSIGN helpRequest( bBlock ) INLINE ::sl_helpRequest := bBlock
DATA sl_move
VAR sl_move
ACCESS move INLINE ::sl_move
ASSIGN move( bBlock ) INLINE ::sl_move := bBlock
DATA sl_quit
VAR sl_quit
ACCESS QUIT INLINE ::sl_quit
ASSIGN quit( bBlock ) INLINE ::sl_quit := bBlock
@@ -219,73 +219,73 @@ METHOD WvgSysWindow:currentSize()
//
//
CLASS WvgFontDialog INHERIT WvgSysWindow
CREATE CLASS WvgFontDialog INHERIT WvgSysWindow
/* Appearance */
DATA title INIT ""
DATA buttonApply INIT .F.
DATA buttonCancel INIT .T.
DATA buttonHelp INIT .F.
DATA buttonOk INIT .T.
DATA buttonReset INIT .F.
DATA strikeOut INIT .T.
DATA underscore INIT .T.
VAR title INIT ""
VAR buttonApply INIT .F.
VAR buttonCancel INIT .T.
VAR buttonHelp INIT .F.
VAR buttonOk INIT .T.
VAR buttonReset INIT .F.
VAR strikeOut INIT .T.
VAR underscore INIT .T.
DATA name INIT .T.
DATA style INIT .T.
DATA size INIT .T.
VAR name INIT .T.
VAR style INIT .T.
VAR size INIT .T.
DATA displayFilter INIT .T.
DATA printerFilter INIT .T.
VAR displayFilter INIT .T.
VAR printerFilter INIT .T.
DATA familyName INIT " "
DATA nominalPointSize INIT 0
VAR familyName INIT " "
VAR nominalPointSize INIT 0
DATA bitmapOnly INIT .F.
DATA fixedOnly INIT .F.
DATA proportionalOnly INIT .T.
VAR bitmapOnly INIT .F.
VAR fixedOnly INIT .F.
VAR proportionalOnly INIT .T.
DATA outLine INIT .T.
DATA previewBGClr INIT RGB( 255, 255, 255 )
DATA previewFGClr INIT RGB( 0, 0, 0 )
DATA previewString INIT " "
DATA printerPS INIT NIL
DATA screenPS INIT NIL
VAR outLine INIT .T.
VAR previewBGClr INIT RGB( 255, 255, 255 )
VAR previewFGClr INIT RGB( 0, 0, 0 )
VAR previewString INIT " "
VAR printerPS INIT NIL
VAR screenPS INIT NIL
DATA synthesizeFonts INIT .T.
VAR synthesizeFonts INIT .T.
DATA vectorOnly INIT .F.
DATA vectorSizes INIT {}
VAR vectorOnly INIT .F.
VAR vectorSizes INIT {}
DATA viewPrinterFonts INIT .F.
DATA viewScreenFonts INIT .T.
VAR viewPrinterFonts INIT .F.
VAR viewScreenFonts INIT .T.
METHOD new( oParent, oOwner, oScreenPS, oPrinterPS, aPos )
METHOD create( oParent, oOwner, oScreenPS, oPrinterPS, aPos )
METHOD destroy()
METHOD display( nMode )
DATA sl_activateApply
VAR sl_activateApply
ACCESS activateApply INLINE ::sl_activateApply
ASSIGN activateApply( bBlock ) INLINE ::sl_activateApply := bBlock
DATA sl_activateCancel
VAR sl_activateCancel
ACCESS activateCancel INLINE ::sl_activateCancel
ASSIGN activateCancel( bBlock ) INLINE ::sl_activateCancel := bBlock
DATA sl_activateOk
VAR sl_activateOk
ACCESS activateOk INLINE ::sl_activateOk
ASSIGN activateOk( bBlock ) INLINE ::sl_activateOk := bBlock
DATA sl_activateReset
VAR sl_activateReset
ACCESS activateReset INLINE ::sl_activateReset
ASSIGN activateReset( bBlock ) INLINE ::sl_activateReset := bBlock
DATA oScreenPS
DATA oPrinterPS
DATA aPos INIT { 0, 0 }
DATA ok INIT .F.
VAR oScreenPS
VAR oPrinterPS
VAR aPos INIT { 0, 0 }
VAR ok INIT .F.
METHOD wndProc( hWnd, nMessage, nwParam, nlParam )
METHOD GetWvgFont( aFont ) PROTECTED
@@ -490,43 +490,43 @@ METHOD GetWvgFont( aFont ) CLASS WvgFontDialog
//
//
CLASS WvgFont
CREATE CLASS WvgFont
DATA hFont
DATA oPS
DATA hdc
VAR hFont
VAR oPS
VAR hdc
DATA familyName INIT ""
DATA height INIT 0
DATA nominalPointSize INIT 0
VAR familyName INIT ""
VAR height INIT 0
VAR nominalPointSize INIT 0
DATA width INIT 0
DATA widthClass INIT .F.
VAR width INIT 0
VAR widthClass INIT .F.
DATA bold INIT .F.
DATA weightClass INIT FW_DONTCARE
VAR bold INIT .F.
VAR weightClass INIT FW_DONTCARE
DATA italic INIT .F.
DATA strikeout INIT .F.
DATA underscore INIT .F.
DATA codePage INIT DEFAULT_CHARSET
VAR italic INIT .F.
VAR strikeout INIT .F.
VAR underscore INIT .F.
VAR codePage INIT DEFAULT_CHARSET
DATA FIXED INIT .F.
DATA antiAliased INIT .F.
VAR FIXED INIT .F.
VAR antiAliased INIT .F.
DATA compoundName INIT ""
VAR compoundName INIT ""
METHOD setCompoundName( cName ) INLINE ::compoundName := cName
DATA generic INIT .T.
VAR generic INIT .T.
DATA baseLine INIT 0 READONLY
DATA dbcs INIT .F.
DATA kerning INIT .F.
DATA mbcs INIT .F.
DATA vector INIT .F.
DATA outlined INIT .F.
VAR baseLine INIT 0 READONLY
VAR dbcs INIT .F.
VAR kerning INIT .F.
VAR mbcs INIT .F.
VAR vector INIT .F.
VAR outlined INIT .F.
DATA aFontInfo INIT {}
VAR aFontInfo INIT {}
METHOD new( oPS )
METHOD create( cFontName )

18
harbour/contrib/gtwvg/tabpage.prg
View File

@@ -82,15 +82,15 @@
//
CLASS WvgTabPage INHERIT WvgWindow
CREATE CLASS WvgTabPage INHERIT WvgWindow
DATA caption INIT NIL /* Character string, Numeric, Object ("") */
DATA clipChildren INIT .T. /* Determines whether Xbase Parts in the child list are clipped during graphic output. */
DATA minimized INIT .T. /* Determines whether the XbpTabPage is minimized after it is created (the page is not visible). */
DATA postOffset INIT 80 /* Determines the distance between the end of the tab and the end of the page as a percentage of the page width. */
DATA preOffset INIT 0 /* Determines the distance between the start of the tab and the start of the page as a percentage of the page width.*/
DATA tabHeight INIT - 1 /* Determines the height of the tab. */
DATA TYPE INIT WVGTABPAGE_TAB_TOP /* Determines the position of the tab. */
VAR caption INIT NIL /* Character string, Numeric, Object ("") */
VAR clipChildren INIT .T. /* Determines whether Xbase Parts in the child list are clipped during graphic output. */
VAR minimized INIT .T. /* Determines whether the XbpTabPage is minimized after it is created (the page is not visible). */
VAR postOffset INIT 80 /* Determines the distance between the end of the tab and the end of the page as a percentage of the page width. */
VAR preOffset INIT 0 /* Determines the distance between the start of the tab and the start of the page as a percentage of the page width.*/
VAR tabHeight INIT - 1 /* Determines the height of the tab. */
VAR TYPE INIT WVGTABPAGE_TAB_TOP /* Determines the position of the tab. */
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -101,7 +101,7 @@ CLASS WvgTabPage INHERIT WvgWindow
METHOD Minimize()
METHOD Maximize()
DATA sl_tabActivate
VAR sl_tabActivate
METHOD tabActivate( xParam ) SETGET
ENDCLASS

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

@@ -76,7 +76,7 @@
//
CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/
CREATE CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/
VAR appearance
VAR style INIT WVGTOOLBAR_STYLE_STANDARD
@@ -470,7 +470,7 @@ METHOD WvgToolBar:buttonDropDown( xParam )
//
//
CLASS WvgToolBarButton
CREATE CLASS WvgToolBarButton
VAR enabled INIT .T.
VAR INDEX INIT 0

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

@@ -76,15 +76,15 @@
//
CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef
CREATE CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef
DATA alwaysShowSelection INIT .F.
DATA hasButtons INIT .F.
DATA hasLines INIT .F.
VAR alwaysShowSelection INIT .F.
VAR hasButtons INIT .F.
VAR hasLines INIT .F.
DATA aItems INIT {}
VAR aItems INIT {}
DATA oRootItem
VAR oRootItem
ACCESS rootItem() INLINE ::oRootItem
METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -95,23 +95,23 @@ CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef
METHOD itemFromPos( aPos )
DATA sl_itemCollapsed
DATA sl_itemExpanded
DATA sl_itemMarked
DATA sl_itemSelected
VAR sl_itemCollapsed
VAR sl_itemExpanded
VAR sl_itemMarked
VAR sl_itemSelected
METHOD itemCollapsed( xParam ) SETGET
METHOD itemExpanded( xParam ) SETGET
METHOD itemMarked( xParam ) SETGET
DATA oItemSelected
VAR oItemSelected
ACCESS itemSelected INLINE ::sl_itemSelected
ASSIGN itemSelected( bBlock ) INLINE ::sl_itemSelected := bBlock
DATA hParentSelected
DATA hItemSelected
DATA textParentSelected INIT ""
DATA textItemSelected INIT ""
VAR hParentSelected
VAR hItemSelected
VAR textParentSelected INIT ""
VAR textItemSelected INIT ""
METHOD getSelectionInfo( nlParam )
METHOD setColorFG( nRGB ) INLINE WVG_TreeView_SetTextColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ) )
@@ -365,21 +365,21 @@ METHOD WvgTreeView:itemSelected( xParam )
/* Class WvgTreeViewItem */
//
CLASS WvgTreeViewItem
CREATE CLASS WvgTreeViewItem
DATA caption INIT ""
DATA dllName INIT NIL
DATA expandedImage INIT - 1
DATA image INIT - 1
DATA markedImage INIT - 1
VAR caption INIT ""
VAR dllName INIT NIL
VAR expandedImage INIT - 1
VAR image INIT - 1
VAR markedImage INIT - 1
DATA hTree
DATA hItem
DATA oParent
DATA oWnd
VAR hTree
VAR hItem
VAR oParent
VAR oWnd
DATA className INIT "TREEVIEWITEM"
DATA objType INIT objTypeTreeViewItem
VAR className INIT "TREEVIEWITEM"
VAR objType INIT objTypeTreeViewItem
METHOD new()
METHOD create()

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

@@ -85,7 +85,7 @@
//
CLASS WvgWindow INHERIT WvgPartHandler
CREATE CLASS WvgWindow INHERIT WvgPartHandler
/* CONFIGURATION */
VAR animate INIT .F.

1
harbour/contrib/hbformat/hbfmtcls.prg
View File

@@ -67,6 +67,7 @@
// 3. wrongly breaks line: 'FUNCTION Hello( /* comment */ )'
// 4. INIT PROCEDURE/EXIT PROCEDURE are not recognized as PROCEDURE statement
// 5. ".T.," / ".F.," gets wrongly corrected to ".T. ," / ".F. ,"
// 6. "end class" is converted to "end CLASS" instead of "END CLASS"
CREATE CLASS HBFORMATCODE

2
harbour/contrib/hbgd/gdbarcod.prg
View File

@@ -62,7 +62,7 @@
CREATE CLASS TCode FROM TBarCode
DATA nType
VAR nType
// EAN-13 ISBN

22
harbour/contrib/hbgd/gdchart.prg
View File

@@ -53,19 +53,19 @@
#include "hbclass.ch"
#include "gd.ch"
CLASS GDChart FROM GDImage
CREATE CLASS GDChart FROM GDImage
DATA cTitle
DATA cAxisX
DATA cAxisY
DATA nWidth
DATA nHeight
DATA nScaleX
DATA nScaleY
VAR cTitle
VAR cAxisX
VAR cAxisY
VAR nWidth
VAR nHeight
VAR nScaleX
VAR nScaleY
DATA aSeries
DATA aDataOfHashes // Hash contains graph datas
DATA hDefs
VAR aSeries
VAR aDataOfHashes // Hash contains graph datas
VAR hDefs
METHOD New( sx, sy ) CONSTRUCTOR

28
harbour/contrib/hbgd/gdimage.prg
View File

@@ -56,24 +56,24 @@
CREATE CLASS GDImage
PROTECTED:
DATA pImage
DATA pBrush
DATA pTile
DATA pFont
DATA pColor
VAR pImage
VAR pBrush
VAR pTile
VAR pFont
VAR pColor
DATA cFontName INIT "Arial"
DATA nFontPitch INIT 20
DATA nFontAngle INIT 0
VAR cFontName INIT "Arial"
VAR nFontPitch INIT 20
VAR nFontAngle INIT 0
DATA aPoints INIT {}
DATA aStyles INIT {}
DATA lDestroy INIT .T.
VAR aPoints INIT {}
VAR aStyles INIT {}
VAR lDestroy INIT .T.
EXPORTED:
DATA hFile
DATA cType
DATA cMime
VAR hFile
VAR cType
VAR cMime
METHOD New( sx, sy ) CONSTRUCTOR

4
harbour/contrib/hbtip/client.prg
View File

@@ -89,8 +89,8 @@
*/
CREATE CLASS tIPClient
CLASSDATA bInitSocks INIT .F.
CLASSDATA cCRLF INIT tip_CRLF()
CLASS VAR bInitSocks INIT .F.
CLASS VAR cCRLF INIT tip_CRLF()
VAR oUrl /* url to wich to connect */
VAR oCredentials /* credential needed to access the service */

6
harbour/contrib/hbtip/url.prg
View File

@@ -82,9 +82,9 @@ CREATE CLASS tURL
HIDDEN:
CLASSDATA cREuri INIT hb_regexComp("(?:(.*)://)?([^?/]*)(/[^?]*)?\??(.*)")
CLASSDATA cREServ INIT hb_regexComp("(?:([^:@]*):?([^@:]*)@|)([^:]+):?(.*)")
CLASSDATA cREFile INIT hb_regexComp("^((?:/.*/)|/)*(.*)$")
CLASS VAR cREuri INIT hb_regexComp("(?:(.*)://)?([^?/]*)(/[^?]*)?\??(.*)")
CLASS VAR cREServ INIT hb_regexComp("(?:([^:@]*):?([^@:]*)@|)([^:]+):?(.*)")
CLASS VAR cREFile INIT hb_regexComp("^((?:/.*/)|/)*(.*)$")
ENDCLASS

14
harbour/contrib/xhb/hblog.prg
View File

@@ -213,7 +213,7 @@ FUNCTION HB_LogDateStamp()
* Logger class
***********************************************/
CLASS HB_Logger
CREATE CLASS HB_Logger
VAR cProgName
VAR aLogToChannel INIT {}
@@ -309,7 +309,7 @@ METHOD PROCEDURE Log( cMessage, nPriority ) CLASS HB_Logger
* Logger Channel class (mostly VIRTUAL)
***********************************************/
CLASS HB_LogChannel
CREATE CLASS HB_LogChannel
VAR lOpened INIT .F.
@@ -420,7 +420,7 @@ METHOD Format( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel
* Console channel
***********************************************/
CLASS HB_LogConsole FROM HB_LogChannel
CREATE CLASS HB_LogConsole FROM HB_LogChannel
METHOD New( nLevel )
METHOD Open( cName )
@@ -492,7 +492,7 @@ METHOD PROCEDURE Out( ... ) CLASS HB_LogConsole
* Console channel - to file
***********************************************/
CLASS HB_LogFile FROM HB_LogChannel
CREATE CLASS HB_LogFile FROM HB_LogChannel
VAR cFileName
VAR nFileHandle
@@ -600,7 +600,7 @@ METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogFile
* Console channel - to dbf
***********************************************/
CLASS HB_LogDbf FROM HB_LogChannel
CREATE CLASS HB_LogDbf FROM HB_LogChannel
VAR cDBFName INIT "messages.dbf"
VAR cIndexName INIT "messages.cdx"
@@ -730,7 +730,7 @@ METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogDbf
* C interface to syslog/ event log system
***********************************************/
CLASS HB_LogSyslog FROM HB_LogChannel
CREATE CLASS HB_LogSyslog FROM HB_LogChannel
VAR nId
@@ -788,7 +788,7 @@ METHOD Send( nType, cMessage, cName, nPriority ) CLASS HB_LogSyslog
* Debug channel
***********************************************/
CLASS HB_LogDebug FROM HB_LogChannel
CREATE CLASS HB_LogDebug FROM HB_LogChannel
VAR nMaxLevel

32
harbour/contrib/xhb/hblognet.prg
View File

@@ -55,17 +55,17 @@
#define HB_THREAD_SUPPORT
CLASS HB_LogEmail FROM HB_LogChannel
CREATE CLASS HB_LogEmail FROM HB_LogChannel
DATA cServer
DATA cAddress INIT "log@xharbour.org"
DATA cSubject INIT "Log message from xharbour application"
DATA cSendTo
DATA cHelo INIT "XHarbour E-mail Logger"
DATA nPort INIT 25
VAR cServer
VAR cAddress INIT "log@xharbour.org"
VAR cSubject INIT "Log message from xharbour application"
VAR cSendTo
VAR cHelo INIT "XHarbour E-mail Logger"
VAR nPort INIT 25
DATA cPrefix
DATA cPostfix
VAR cPrefix
VAR cPostfix
METHOD New( nLevel, cHelo, cServer, cSendTo, cSubject, cFrom )
METHOD Open( cName )
@@ -220,16 +220,16 @@ METHOD Prepare( nStyle, cMessage, cName, nPriority ) CLASS HB_LogEmail
* Channel for monitors listening on a port
*************************************************/
CLASS HB_LogInetPort FROM HB_LogChannel
CREATE CLASS HB_LogInetPort FROM HB_LogChannel
DATA nPort INIT 7761
DATA aListeners INIT {}
DATA skIn
VAR nPort INIT 7761
VAR aListeners INIT {}
VAR skIn
#ifdef HB_THREAD_SUPPORT
DATA bTerminate INIT .F.
DATA nThread
DATA mtxBusy
VAR bTerminate INIT .F.
VAR nThread
VAR mtxBusy
#endif
METHOD New( nLevel, nPort )

46
harbour/contrib/xhb/hjwindow.prg
View File

@@ -47,33 +47,33 @@
#include "hbclass.ch"
#include "cgi.ch"
CLASS TJsWindow
CREATE CLASS TJsWindow
DATA nH
DATA Name INIT ""
DATA oHtm
DATA VarName INIT ""
DATA URL INIT ""
DATA Features INIT ""
VAR nH
VAR Name INIT ""
VAR oHtm
VAR VarName INIT ""
VAR URL INIT ""
VAR Features INIT ""
DATA ScreenX, ScreenY INIT 100
DATA HEIGHT, WIDTH INIT 300
DATA innerHeight, innerWidth, outerHeight INIT 0
DATA alwaysRaised, alwaysLowered INIT .F.
DATA Menubar, personalBar INIT .F.
DATA location, directories, copyHistory INIT .F.
DATA Toolbar INIT .F.
DATA Status, TitleBar INIT .T.
DATA Scrollbars, Resizable, dependent INIT .T.
VAR ScreenX, ScreenY INIT 100
VAR HEIGHT, WIDTH INIT 300
VAR innerHeight, innerWidth, outerHeight INIT 0
VAR alwaysRaised, alwaysLowered INIT .F.
VAR Menubar, personalBar INIT .F.
VAR location, directories, copyHistory INIT .F.
VAR Toolbar INIT .F.
VAR Status, TitleBar INIT .T.
VAR Scrollbars, Resizable, dependent INIT .T.
DATA TITLE
DATA aScriptSRC
DATA aServerSRC
DATA BGIMAGE, BGCOLOR, fontColor
DATA Style
VAR TITLE
VAR aScriptSRC
VAR aServerSRC
VAR BGIMAGE, BGCOLOR, fontColor
VAR Style
DATA onLoad
DATA onUnLoad
VAR onLoad
VAR onUnLoad
METHOD New( cVarName, cUrl, cName, x, y, w, h )

28
harbour/contrib/xhb/htjlist.prg
View File

@@ -51,21 +51,21 @@
#include "hbclass.ch"
#include "cgi.ch"
CLASS TJsList
CREATE CLASS TJsList
DATA nH INIT STD_OUT
DATA aScript INIT {}
DATA aItems INIT {}
DATA cScript INIT ""
DATA nTimes INIT 0
DATA nItems INIT 0
DATA cMainNode INIT ""
DATA cCurrentNode INIT ""
DATA Style INIT _WHITE_BLACK_STYLE
DATA FONT INIT "Verdana"
DATA Size INIT 2
DATA BGCOLOR INIT "white"
DATA FontColor INIT "black"
VAR nH INIT STD_OUT
VAR aScript INIT {}
VAR aItems INIT {}
VAR cScript INIT ""
VAR nTimes INIT 0
VAR nItems INIT 0
VAR cMainNode INIT ""
VAR cCurrentNode INIT ""
VAR Style INIT _WHITE_BLACK_STYLE
VAR FONT INIT "Verdana"
VAR Size INIT 2
VAR BGCOLOR INIT "white"
VAR FontColor INIT "black"
METHOD New( name, lOpen, width, height, bgColor, ;
FONT, fntColor, fntSize, cMinusImg, cPlusImg )

2
harbour/contrib/xhb/htmutil.prg
View File

@@ -300,7 +300,7 @@ PROCEDURE htmlBrowseSql( oHtm, cAction, lUseLinks, cTarget, oServer, oQuery )
#endif
CLASS JWindow
CREATE CLASS JWindow
VAR nH
VAR Name INIT ""

2
harbour/contrib/xhb/tcgi.prg
View File

@@ -47,7 +47,7 @@
#include "hbclass.ch"
#include "cgi.ch"
CLASS TCgi FROM THtml
CREATE CLASS TCgi FROM THtml
VAR nH
VAR Server_Software

20
harbour/contrib/xhb/tfile.prg
View File

@@ -50,17 +50,17 @@
#translate FPOS( <f> ) => FSeek( <f>, 0, FS_RELATIVE )
CLASS TCgiFile
CREATE CLASS TCgiFile
DATA Buffer INIT ""
DATA Name INIT ""
DATA Handle
DATA FileSize INIT 0
DATA BytesRead INIT 0
DATA cPage INIT ""
DATA nPage INIT 0
DATA nPageSize INIT 1024
DATA nRecord INIT 0
VAR Buffer INIT ""
VAR Name INIT ""
VAR Handle
VAR FileSize INIT 0
VAR BytesRead INIT 0
VAR cPage INIT ""
VAR nPage INIT 0
VAR nPageSize INIT 1024
VAR nRecord INIT 0
METHOD New( cName )

104
harbour/contrib/xhb/trpc.prg
View File

@@ -203,20 +203,20 @@
* RPC FUNCTION
*************************************/
CLASS tRPCFunction
CREATE CLASS tRPCFunction
DATA cName
DATA aParameters
DATA cReturn
DATA cSerial
DATA nAuthLevel
VAR cName
VAR aParameters
VAR cReturn
VAR cSerial
VAR nAuthLevel
DATA oExecutable
DATA oMethod
VAR oExecutable
VAR oMethod
DATA aCall
VAR aCall
CLASSDATA cPattern INIT hb_regexComp( "^C:[0-9]{1,6}$|^A$|^O$|^D$|^N$|^NI$" )
CLASS VAR cPattern INIT hb_regexComp( "^C:[0-9]{1,6}$|^A$|^O$|^D$|^N$|^NI$" )
METHOD New( cFname, cSerial, nAuthLevel, oExec, oMeth ) CONSTRUCTOR
METHOD SetCallable( oExec, oMeth )
@@ -370,24 +370,24 @@ METHOD Describe() CLASS tRPCFunction
* Connection manager class; this manages a single connection
************************************************************/
CLASS tRPCServeCon
CREATE CLASS tRPCServeCon
/* back reference to the parent to get callback blocks */
DATA oServer
VAR oServer
/* Socket, mutex and thread */
DATA skRemote
DATA mtxBusy
DATA thSelf INIT NIL
VAR skRemote
VAR mtxBusy
VAR thSelf INIT NIL
/* Assigned authorization level */
DATA nAuthLevel
VAR nAuthLevel
/* User ID */
DATA cUserId
VAR cUserId
/* Allow progress ? */
DATA lAllowProgress
VAR lAllowProgress
METHOD New( oParent, skIn ) CONSTRUCTOR
METHOD Destroy()
@@ -404,18 +404,18 @@ CLASS tRPCServeCon
METHOD GetStatus() INLINE ::nStatus
HIDDEN:
/* Current status */
DATA nStatus INIT RPCS_STATUS_NONE
VAR nStatus INIT RPCS_STATUS_NONE
/* Is this connection encrypted? */
DATA bEncrypted
VAR bEncrypted
/* crc for challenge handshake */
DATA nChallengeCRC
VAR nChallengeCRC
/* Temporary supposed user in challenge */
DATA cChallengeUserid
DATA cCryptKey
VAR cChallengeUserid
VAR cCryptKey
/* Function execution data */
DATA thFunction INIT NIL
DATA lCanceled INIT .F.
VAR thFunction INIT NIL
VAR lCanceled INIT .F.
METHOD RecvAuth( lEncrypt )
METHOD RecvChallenge()
@@ -1189,42 +1189,42 @@ METHOD Decrypt( cDataIn ) CLASS tRPCServeCon
* RPC SERVICE
*************************************/
CLASS tRPCService
CREATE CLASS tRPCService
DATA cServerName INIT "RPCGenericServer"
DATA aFunctions
CLASSDATA lInit INIT hb_inetInit()
VAR cServerName INIT "RPCGenericServer"
VAR aFunctions
CLASS VAR lInit INIT hb_inetInit()
DATA nUdpPort INIT 1139
DATA nTcpPort INIT 1140
DATA cBindAddress INIT NIL
DATA thAccept INIT 0
DATA thUdp INIT 0
DATA aServing INIT {}
DATA mtxBusy INIT hb_mutexCreate()
VAR nUdpPort INIT 1139
VAR nTcpPort INIT 1140
VAR cBindAddress INIT NIL
VAR thAccept INIT 0
VAR thUdp INIT 0
VAR aServing INIT {}
VAR mtxBusy INIT hb_mutexCreate()
DATA skUdp
DATA skServer
VAR skUdp
VAR skServer
/* Code blocks corresponding to event handlers */
DATA bAuthorize
DATA bGetEncryption
DATA bOnFunctionScan
DATA bOnServerScan
DATA bOnClientConnect
DATA bOnClientLogin
DATA bOnClientRequest
DATA bOnFunctionProgress
DATA bOnFunctionError
DATA bOnFunctionReturn
DATA bOnFunctionCanceled
DATA bOnClientLogout
DATA bOnClientTerminate
VAR bAuthorize
VAR bGetEncryption
VAR bOnFunctionScan
VAR bOnServerScan
VAR bOnClientConnect
VAR bOnClientLogin
VAR bOnClientRequest
VAR bOnFunctionProgress
VAR bOnFunctionError
VAR bOnFunctionReturn
VAR bOnFunctionCanceled
VAR bOnClientLogout
VAR bOnClientTerminate
METHOD New() CONSTRUCTOR
/* Block run on client connection request */
DATA bConnection
VAR bConnection
/* Function management */
METHOD Add( xFunction, cVersion, nLevel, oExec, oMethod )

70
harbour/contrib/xhb/trpccli.prg
View File

@@ -55,28 +55,28 @@
#include "hbrpc.ch"
CLASS tRPCClient
CREATE CLASS tRPCClient
DATA aServers
DATA aFunctions
VAR aServers
VAR aFunctions
DATA nUdpPort
DATA nTcpPort
VAR nUdpPort
VAR nTcpPort
/* asyncrhonous mode */
DATA lAsyncMode
VAR lAsyncMode
/* block to be called at scan completion */
DATA bOnScanComplete
VAR bOnScanComplete
/*block called when there is a progress in the scan */
DATA bOnScanServersProgress
DATA bOnScanFunctionsProgress
VAR bOnScanServersProgress
VAR bOnScanFunctionsProgress
/* block to be called at function error */
DATA bOnFunctionProgress
VAR bOnFunctionProgress
/* block to be called at function success */
DATA bOnFunctionReturn
VAR bOnFunctionReturn
/* block to be called at function failure */
DATA bOnFunctionFail
VAR bOnFunctionFail
METHOD New( cNetwork, nTcpPort, nUdpPort ) CONSTRUCTOR
@@ -130,44 +130,44 @@ CLASS tRPCClient
HIDDEN:
// Automatic initialization of inet support
CLASSDATA lInit INIT hb_inetInit()
CLASS VAR lInit INIT hb_inetInit()
DATA mtxBusy INIT hb_mutexCreate()
VAR mtxBusy INIT hb_mutexCreate()
DATA nStatus
VAR nStatus
// This RPC protocol breaking error code
DATA nErrorCode
VAR nErrorCode
/* Network data */
DATA cServer
DATA cNetwork
DATA skUdp
DATA skTcp
VAR cServer
VAR cNetwork
VAR skUdp
VAR skTcp
/* Timeout system */
DATA nTimeout INIT -1
DATA nTimeLimit INIT -1
DATA caPerCall
VAR nTimeout INIT -1
VAR nTimeLimit INIT -1
VAR caPerCall
DATA nUdpTimeBegin INIT 0
DATA thUdpAccept INIT NIL
VAR nUdpTimeBegin INIT 0
VAR thUdpAccept INIT NIL
DATA nTcpTimeBegin INIT 0
DATA thTcpAccept INIT NIL
VAR nTcpTimeBegin INIT 0
VAR thTcpAccept INIT NIL
/* XHB RPC Loop system */
DATA nLoopMode
DATA aLoopData
DATA nLoopStart
DATA nLoopEnd
DATA nLoopStep
VAR nLoopMode
VAR aLoopData
VAR nLoopStart
VAR nLoopEnd
VAR nLoopStep
/* Encryption data */
DATA bEncrypted
DATA cCryptKey
VAR bEncrypted
VAR cCryptKey
/* Last connection result */
DATA oResult
VAR oResult
/* Encryption system */
METHOD Encrypt( cDataIn )

96
harbour/contrib/xhb/ttable.prg
View File

@@ -502,15 +502,15 @@ FUNCTION GetTable( cAlias )
*
*/
CLASS HBField
CREATE CLASS HBField
DATA ALIAS INIT Alias()
DATA Name INIT ""
DATA TYPE INIT "C"
DATA Len INIT 0
DATA Dec INIT 0
DATA ORDER INIT 0
DATA Value
VAR ALIAS INIT Alias()
VAR Name INIT ""
VAR TYPE INIT "C"
VAR Len INIT 0
VAR Dec INIT 0
VAR ORDER INIT 0
VAR Value
METHOD Get() INLINE ::value := ( ::alias )->( FieldGet( ::order ) )
METHOD Put( x ) INLINE ::value := x, ;
@@ -526,12 +526,12 @@ ENDCLASS
*
*/
CLASS HBRecord
CREATE CLASS HBRecord
DATA Buffer INIT {}
DATA ALIAS INIT Alias()
DATA Number INIT 0
DATA aFields INIT {}
VAR Buffer INIT {}
VAR ALIAS INIT Alias()
VAR Number INIT 0
VAR aFields INIT {}
METHOD New( cAlias )
METHOD Get()
@@ -618,33 +618,33 @@ METHOD PROCEDURE Put() CLASS HBRecord
//ORDER Management
//
CLASS HBTable
CREATE CLASS HBTable
DATA Buffer INIT {} // 1
DATA ALIAS INIT Alias() // 2
DATA Area INIT 0 // 3
VAR Buffer INIT {} // 1
VAR ALIAS INIT Alias() // 2
VAR Area INIT 0 // 3
DATA oRec
DATA aStruc INIT {}
DATA nRecno INIT 0
DATA cDBF INIT ""
DATA cOrderBag INIT ""
DATA cOrderFile INIT ""
DATA cPATH INIT ""
DATA Driver INIT "DBFCDX"
DATA IsNew INIT .T.
DATA IsReadOnly INIT .F.
DATA IsNet INIT .T.
DATA aSaveState INIT {}
DATA lMonitor INIT .F.
DATA ReadBuffers INIT {}
DATA WriteBuffers INIT {}
DATA DeleteBuffers INIT {}
DATA nDataOffset INIT 0
DATA BlankBuffer INIT {}
DATA aOrders INIT {}
DATA aChildren INIT {}
DATA oParent
VAR oRec
VAR aStruc INIT {}
VAR nRecno INIT 0
VAR cDBF INIT ""
VAR cOrderBag INIT ""
VAR cOrderFile INIT ""
VAR cPATH INIT ""
VAR Driver INIT "DBFCDX"
VAR IsNew INIT .T.
VAR IsReadOnly INIT .F.
VAR IsNet INIT .T.
VAR aSaveState INIT {}
VAR lMonitor INIT .F.
VAR ReadBuffers INIT {}
VAR WriteBuffers INIT {}
VAR DeleteBuffers INIT {}
VAR nDataOffset INIT 0
VAR BlankBuffer INIT {}
VAR aOrders INIT {}
VAR aChildren INIT {}
VAR oParent
METHOD EOF() INLINE ( ::Alias )->( EOF() )
METHOD BOF() INLINE ( ::Alias )->( BOF() )
@@ -1481,17 +1481,17 @@ METHOD OnError( uParam ) CLASS HBTable
RETURN uRet
CLASS HBOrder
CREATE CLASS HBOrder
DATA oTable
DATA cOrderBag
DATA Label, TAG
DATA cKey, bKey
DATA cFor, bFor
DATA cWhile, bWhile
DATA UNIQUE INIT .F.
DATA bEval
DATA nInterval
VAR oTable
VAR cOrderBag
VAR Label, TAG
VAR cKey, bKey
VAR cFor, bFor
VAR cWhile, bWhile
VAR UNIQUE INIT .F.
VAR bEval
VAR nInterval
METHOD Alias() INLINE ::oTable:Alias
METHOD New( cTag, cKey, cLabel, cFor, cWhile, lUnique, bEval, nInterval, cOrderBag )

58
harbour/contrib/xhb/txml.prg
View File

@@ -56,18 +56,18 @@
#include "hbxml.ch"
#include "hbclass.ch"
CLASS TXMLNode
CREATE CLASS TXMLNode
DATA nType
DATA cName
DATA aAttributes
DATA nBeginLine
DATA cData
VAR nType
VAR cName
VAR aAttributes
VAR nBeginLine
VAR cData
DATA oNext
DATA oPrev
DATA oParent
DATA oChild
VAR oNext
VAR oPrev
VAR oParent
VAR oChild
METHOD New( nType, cName, aAttributes, cData ) CONSTRUCTOR
METHOD Clone() INLINE HBXml_node_clone( Self )
@@ -166,7 +166,7 @@ METHOD Path() CLASS TXmlNode
Iterator class
*********************************************/
CLASS TXmlIterator
CREATE CLASS TXmlIterator
METHOD New( oNodeTop ) CONSTRUCTOR
METHOD Next()
@@ -180,16 +180,16 @@ CLASS TXmlIterator
PROTECTED:
METHOD MatchCriteria( oNode )
DATA cName
DATA cAttribute
DATA cValue
DATA cData
VAR cName
VAR cAttribute
VAR cValue
VAR cData
HIDDEN:
DATA nTopLevel
VAR nTopLevel
DATA oNode
DATA oTop
VAR oNode
VAR oTop
ENDCLASS
@@ -269,7 +269,7 @@ METHOD MatchCriteria( oNode ) CLASS TXmlIterator
Iterator scan class
*********************************************/
CLASS TXmlIteratorScan FROM TXmlIterator
CREATE CLASS TXmlIteratorScan FROM TXmlIterator
METHOD New( oNodeTop ) CONSTRUCTOR
PROTECTED:
@@ -308,7 +308,7 @@ METHOD MatchCriteria( oFound ) CLASS TXmlIteratorScan
Iterator regex class
*********************************************/
CLASS TXmlIteratorRegex FROM TXmlIterator
CREATE CLASS TXmlIteratorRegex FROM TXmlIterator
METHOD New( oNodeTop ) CONSTRUCTOR
PROTECTED:
@@ -351,14 +351,14 @@ METHOD MatchCriteria( oFound ) CLASS TXmlIteratorRegex
Document Class
*********************************************/
CLASS TXmlDocument
CREATE CLASS TXmlDocument
DATA oRoot
DATA nStatus
DATA nError
DATA nLine
DATA oErrorNode
DATA nNodeCount
VAR oRoot
VAR nStatus
VAR nError
VAR nLine
VAR oErrorNode
VAR nNodeCount
METHOD New( xElem, nStyle ) CONSTRUCTOR
METHOD Read( xData, nStyle ) INLINE HBXML_DATAREAD( Self, xData, nStyle )
@@ -373,8 +373,8 @@ CLASS TXmlDocument
HIDDEN:
DATA oIterator
DATA cHeader
VAR oIterator
VAR cHeader
ENDCLASS

88
harbour/contrib/xhb/xhbtedit.prg
View File

@@ -102,62 +102,62 @@
CREATE CLASS XHBEditor
DATA cFile INIT "" // name of file being edited
VAR cFile INIT "" // name of file being edited
DATA aText INIT {} // array with lines of text being edited
VAR aText INIT {} // array with lines of text being edited
DATA nTop // boundaries of editor window, without box around
DATA nLeft
DATA nBottom
DATA nRight
VAR nTop // boundaries of editor window, without box around
VAR nLeft
VAR nBottom
VAR nRight
DATA nFirstCol INIT 1 // FirstCol/Row of current text visible inside editor window
DATA nFirstRow INIT 1
DATA nRow INIT 1 // Cursor position inside aText (nRow) and inside current line of text (nCol)
DATA nCol INIT 1
VAR nFirstCol INIT 1 // FirstCol/Row of current text visible inside editor window
VAR nFirstRow INIT 1
VAR nRow INIT 1 // Cursor position inside aText (nRow) and inside current line of text (nCol)
VAR nCol INIT 1
DATA nPhysRow INIT 0 // Hardware cursor position, I cannot rely on Row()/Col() because I could be inside another
DATA nPhysCol INIT 0 // application/object and this one could be moving real cursor. If I'm running full
VAR nPhysRow INIT 0 // Hardware cursor position, I cannot rely on Row()/Col() because I could be inside another
VAR nPhysCol INIT 0 // application/object and this one could be moving real cursor. If I'm running full
// screen nPhysRow will always have the same value as Row() and nPhysCol as Col()
DATA nTextRow INIT 0 // Display position of the cursor whitin the text buffer.
DATA nTextCol INIT 0 // idem.
DATA nWndRow INIT 0 // Initial position of cursor whitin text window.
DATA nWndCol INIT 0 // idem.
VAR nTextRow INIT 0 // Display position of the cursor whitin the text buffer.
VAR nTextCol INIT 0 // idem.
VAR nWndRow INIT 0 // Initial position of cursor whitin text window.
VAR nWndCol INIT 0 // idem.
DATA nNumCols INIT 1 // How many columns / rows can be displayed inside editor window
DATA nNumRows INIT 1
VAR nNumCols INIT 1 // How many columns / rows can be displayed inside editor window
VAR nNumRows INIT 1
DATA nTabWidth INIT 5 // Size of Tab chars
DATA lEditAllow INIT .T. // Are changes to text allowed?
DATA lSaved INIT .F. // True if user exited editor with K_CTRL_W
DATA lWordWrap INIT .T. // .F. earlier, True if word wrapping is active
DATA nWordWrapCol INIT 0 // At which column word wrapping occurs
DATA lChanged INIT .F. // .T. if there are changes not saved
DATA lExitEdit INIT .F. // .T. if user requested to end Edit() method
VAR nTabWidth INIT 5 // Size of Tab chars
VAR lEditAllow INIT .T. // Are changes to text allowed?
VAR lSaved INIT .F. // True if user exited editor with K_CTRL_W
VAR lWordWrap INIT .T. // .F. earlier, True if word wrapping is active
VAR nWordWrapCol INIT 0 // At which column word wrapping occurs
VAR lChanged INIT .F. // .T. if there are changes not saved
VAR lExitEdit INIT .F. // .T. if user requested to end Edit() method
DATA cColorSpec INIT SetColor() // Color string used for screen writes
VAR cColorSpec INIT SetColor() // Color string used for screen writes
DATA lRightScroll INIT .T. // MARKER TO SET LINE SCROLLING OF R_KEY
DATA nMarkPos // Mark proper new position of cursor when wrapping and splitting lines
DATA nMarkLen
DATA nOrigCursor INIT SetCursor() // Save to restore original cursor format on exit
VAR lRightScroll INIT .T. // MARKER TO SET LINE SCROLLING OF R_KEY
VAR nMarkPos // Mark proper new position of cursor when wrapping and splitting lines
VAR nMarkLen
VAR nOrigCursor INIT SetCursor() // Save to restore original cursor format on exit
DATA ProcName INIT ""
DATA ProcLine INIT 0
VAR ProcName INIT ""
VAR ProcLine INIT 0
DATA nCurrentCursor INIT SetCursor()
VAR nCurrentCursor INIT SetCursor()
DATA lSelActive INIT .F.
DATA nRowSelStart INIT 0 // First row selected
DATA nRowSelEnd INIT 0 // Last row selected
DATA nColSelRow INIT 0 // Row of col selected
DATA nColSelStart INIT 0 // First col selected
DATA nColSelEnd INIT 0 // Last col selected
VAR lSelActive INIT .F.
VAR nRowSelStart INIT 0 // First row selected
VAR nRowSelEnd INIT 0 // Last row selected
VAR nColSelRow INIT 0 // Row of col selected
VAR nColSelStart INIT 0 // First col selected
VAR nColSelEnd INIT 0 // Last col selected
// Class DATA can be faster, but since the user can change directly
// Class VAR can be faster, but since the user can change directly
// READINSERT(), ::lInsert must check in it.
// DATA lInsert INIT .F. // Is editor in Insert mode or in Overstrike one? Default : Overstrike - Clipper
// VAR lInsert INIT .F. // Is editor in Insert mode or in Overstrike one? Default : Overstrike - Clipper
METHOD lInsert() BLOCK {|| Set( _SET_INSERT ) }
METHOD _lInsert( lInsert ) BLOCK {| Self, lInsert | HB_SYMBOL_UNUSED( Self ), iif( HB_ISLOGICAL( lInsert ), Set( _SET_INSERT, lInsert ), Set( _SET_INSERT ) ) }
@@ -233,9 +233,9 @@ CREATE CLASS XHBEditor
METHOD K_Esc()
// 2006/07/19 - E.F. - Added datas and methods.
DATA cInsLabel // <Insert> label to display at toggle insert
DATA lVerticalScroll INIT .T. // True if vertical scrolling is active (default)
DATA bKeyBlock // To process set key codeblock
VAR cInsLabel // <Insert> label to display at toggle insert
VAR lVerticalScroll INIT .T. // True if vertical scrolling is active (default)
VAR bKeyBlock // To process set key codeblock
METHOD DisplayInsert( lInsert ) // Show <insert> message at top of screen
METHOD LastRow() INLINE Len( ::aText ) // Replace old ::naTextLen

8
harbour/doc/clipper.txt
View File

@@ -150,12 +150,12 @@ for example:
is not a value of type object.
for example:
CLASS foo
DATA name INIT 'FOO'
CREATE CLASS foo
VAR name INIT 'FOO'
ENDCLASS
CLASS bar
DATA name INIT 'BAR'
CREATE CLASS bar
VAR name INIT 'BAR'
ENDCLASS
WITH OBJECT foo():new()

90
harbour/doc/en/command.txt
View File

@@ -38,10 +38,10 @@
* as a static function. It will therefore not be available outside the current module.
* $DESCRIPTION$
* CLASS creates a class from which you can create objects.
* The CLASS command begins the class specification, in which the DATA
* The CLASS command begins the class specification, in which the VAR
* elements (also known as instance variables) and METHODS of the
* class are named. The following scoping commands may also appear.
* They control the default scope of DATA and METHOD commands that follow them.
* They control the default scope of VAR and METHOD commands that follow them.
*
* <fixed>
* EXPORTED:
@@ -56,7 +56,7 @@
*
* A program uses a Class by calling the Class Constructor, usually the
* New() method, to create an object. That object is usually assigned
* to a variable, which is used to access the DATA elements and
* to a variable, which is used to access the VAR elements and
* methods.
*
* Harbour's OOP syntax and implementation supports Scoping (Protect, Hidden and Readonly)
@@ -87,7 +87,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* HBClass(),Object Oriented Programming,DATA,METHOD
* HBClass(),Object Oriented Programming,VAR,METHOD
* $END$
*/
@@ -95,7 +95,7 @@
* $TEMPLATE$
* Command
* $NAME$
* DATA
* VAR
* $CATEGORY$
* Class
* $SUBCATEGORY$
@@ -103,22 +103,22 @@
* $ONELINER$
* Alternate syntax for VAR: instance variable for the objects.
* $SYNTAX$
* DATA <DataName1> [,<DataNameN>] [ AS <type> ] [ INIT <uValue> ]
* VAR <DataName1> [,<DataNameN>] [ AS <type> ] [ INIT <uValue> ]
* [[EXPORTED | VISIBLE] | [PROTECTED] | [HIDDEN]] [READONLY | RO]
* $ARGUMENTS$
* <DataName1> Name of the DATA
* <DataName1> Name of the VAR
* <type> Optional data type specification from the following:
* Character, Numeric, Date, Logical, Codeblock, Nil.
*
* <uValue> Optional initial value when creating a new object.
*
* EXPORTED Specifies that this DATA is accessible to functions and
* EXPORTED Specifies that this VAR is accessible to functions and
* methods outside of the class. VISIBLE is a synonym for EXPORTED.
*
* PROTECTED Specifies that this DATA is only accessible to functions and methods within this class and its subclasses.
* PROTECTED Specifies that this VAR is only accessible to functions and methods within this class and its subclasses.
*
* HIDDEN Specifies that this DATA is only accessible to the
* HIDDEN Specifies that this VAR is only accessible to the
* class where it was defined, and is not inherited by the
* subclasses.
*
@@ -128,37 +128,37 @@
* assignment is only permitted from the current class.
* RO is a synonym for READONLY.
* $DESCRIPTION$
* DATA elements can also be thought of as the "properties" of an
* VAR elements can also be thought of as the "properties" of an
* object. They can be of any data type, including codeblock.
* Once an object has been created, the DATA elements are referenced
* Once an object has been created, the VAR elements are referenced
* with the colon (:) as in MyObject:Heading := "Last name".
* Usually a class also defines methods to manipulate the DATA.
* Usually a class also defines methods to manipulate the VAR.
*
* You can use the "AS <type>" clause to enforce that the DATA is
* You can use the "AS <type>" clause to enforce that the VAR is
* maintained as a certain type. Otherwise it will take on the type of
* whatever value is first assigned to it.
*
* Use the "INIT <uValue>" clause to initialize that DATA to <uValue>
* Use the "INIT <uValue>" clause to initialize that VAR to <uValue>
* whenever a new object is created.
*
* VAR can be a synonym for DATA, or it can use a slightly different
* VAR can be a synonym for VAR, or it can use a slightly different
* syntax for compatibility with other dialects.
* $EXAMPLES$
* CREATE CLASS TBColumn
*
* DATA Block // Code block to retrieve data for the column
* DATA Cargo // User-definable variable
* DATA ColorBlock // Code block that determines color of data items
* DATA ColSep // Column separator character
* DATA DefColor // Array of numeric indexes into the color table
* DATA Footing // Column footing
* DATA FootSep // Footing separator character
* DATA Heading // Column heading
* DATA HeadSep // Heading separator character
* DATA Width // Column display width
* DATA ColPos // Temporary column position on screen
* VAR Block // Code block to retrieve data for the column
* VAR Cargo // User-definable variable
* VAR ColorBlock // Code block that determines color of data items
* VAR ColSep // Column separator character
* VAR DefColor // Array of numeric indexes into the color table
* VAR Footing // Column footing
* VAR FootSep // Footing separator character
* VAR Heading // Column heading
* VAR HeadSep // Heading separator character
* VAR Width // Column display width
* VAR ColPos // Temporary column position on screen
*
* METHOD New() // Constructor
* METHOD New() // Constructor
*
* ENDCLASS
* $STATUS$
@@ -168,7 +168,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* Object Oriented Programming,CLASS,METHOD,CLASSDATA,VAR
* Object Oriented Programming,CLASS,METHOD,CLASS VAR,VAR
* $END$
*/
@@ -176,39 +176,39 @@
* $TEMPLATE$
* Command
* $NAME$
* CLASSDATA
* CLASS VAR
* $CATEGORY$
* Class
* $SUBCATEGORY$
* Data
* $ONELINER$
* Define a CLASSDATA variable for a class (NOT for an Object!)
* Define a CLASS VAR variable for a class (NOT for an Object!)
* $SYNTAX$
* CLASSDATA <DataName1> [,<DataNameN>] [ AS <type> ] [ INIT <uValue> ]
* CLASS VAR <DataName1> [,<DataNameN>] [ AS <type> ] [ INIT <uValue> ]
* $ARGUMENTS$
* <DataName1> Name of the DATA
* <DataName1> Name of the VAR
*
* <type> Optional data type specification from the following:
* Character, Numeric, Date, Logical, Codeblock, Nil
*
* <uValue> Optional initial value at program startup
* $DESCRIPTION$
* CLASSDATA variables can also be thought of as the "properties" of an
* entire class. Each CLASSDATA exists only once, no matter how many
* CLASS VAR variables can also be thought of as the "properties" of an
* entire class. Each CLASS VAR exists only once, no matter how many
* objects are created. A common usage is for a counter that is
* incremented whenever an object is created and decremented when one
* is destroyed, thus monitoring the number of objects in existence
* for this class.
*
* You can use the "AS <type>" clause to enforce that the CLASSDATA is
* You can use the "AS <type>" clause to enforce that the CLASS VAR is
* maintained as a certain type. Otherwise it will take on the type of
* whatever value is first assigned to it.
* Use the "INIT <uValue>" clause to initialize that DATA to <uValue>
* Use the "INIT <uValue>" clause to initialize that VAR to <uValue>
* whenever the class is first used.
* $EXAMPLES$
* CREATE CLASS TWindow
* DATA hWnd, nOldProc
* CLASSDATA lRegistered AS LOGICAL
* VAR hWnd, nOldProc
* CLASS VAR lRegistered AS LOGICAL
* ENDCLASS
* $STATUS$
* R
@@ -217,7 +217,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* Object Oriented Programming,CLASS,METHOD,DATA
* Object Oriented Programming,CLASS,METHOD,VAR
* $END$
*/
@@ -328,7 +328,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* HBClass(),Object Oriented Programming,DATA,CLASS
* HBClass(),Object Oriented Programming,VAR,CLASS
* $END$
*/
@@ -384,7 +384,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* METHOD,DATA,CLASS,Object Oriented Programming
* METHOD,VAR,CLASS,Object Oriented Programming
* $END$
*/
@@ -419,7 +419,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* Object Oriented Programming,ON ERROR,CLASS,METHOD,DATA
* Object Oriented Programming,ON ERROR,CLASS,METHOD,VAR
* $END$
*/
@@ -455,7 +455,7 @@
* $PLATFORMS$
* All
* $SEEALSO$
* Object Oriented Programming,ERROR HANDLER,CLASS,METHOD,DATA
* Object Oriented Programming,ERROR HANDLER,CLASS,METHOD,VAR
* $END$
*/
@@ -488,6 +488,6 @@
* $PLATFORMS$
* All
* $SEEALSO$
* Object Oriented Programming,CLASS,METHOD,DATA
* Object Oriented Programming,CLASS,METHOD,VAR
* $END$
*/

64
harbour/doc/en/objfunc.txt
View File

@@ -28,7 +28,7 @@
* $SUBCATEGORY$
* Objects
* $ONELINER$
* Determine whether a symbol exist in object as DATA
* Determine whether a symbol exist in object as VAR
* $SYNTAX$
* __objHasData( <oObject>, <cSymbol> ) --> lExist
* $ARGUMENTS$
@@ -36,7 +36,7 @@
*
* <cSymbol> is the name of the symbol to look for.
* $RETURNS$
* __objHasData() return .T. if the given <cSymbol> exist as DATA
* __objHasData() return .T. if the given <cSymbol> exist as VAR
* (instance variable) in object <oObject), .F. if it does not exist.
* $DESCRIPTION$
* __objHasData() is a low level class support function that let you
@@ -82,7 +82,7 @@
* find out if a symbol is a class function in a given object.
* $EXAMPLES$
* oB := TBrowseNew( 0, 0, 24, 79 )
* ? __objHasMethod( oB, "nLeft" ) // .F. since this is a DATA
* ? __objHasMethod( oB, "nLeft" ) // .F. since this is a VAR
* ? __objHasMethod( oB, "FixBugs" ) // hopefully this should be .F.
* ? __objHasMethod( oB, "Left" ) // this should return .T.
* $STATUS$
@@ -106,7 +106,7 @@
* $SUBCATEGORY$
* Objects
* $ONELINER$
* Return names of all DATA or METHOD for a given object
* Return names of all VAR or METHOD for a given object
* $SYNTAX$
* __objGetMsgList( <oObject>, [<lData>], [nClassType] ) --> aNames
* $ARGUMENTS$
@@ -114,14 +114,14 @@
*
* <lData> is an optional logical value that specifies the information
* to return. A value of .T. instruct the function to return list of
* all DATA names, .F. return list of all METHOD names. Default value
* all VAR names, .F. return list of all METHOD names. Default value
* is .T.
*
* <nClassType> is on optional numeric code for selecting which class
* type to return. Default value is HB_MSGLISTALL, returning the whole
* list.
* $RETURNS$
* __objGetMsgList() return an array of character stings with all DATA
* __objGetMsgList() return an array of character stings with all VAR
* names or all METHOD names for a given object. __objGetMsgList()
* would return an empty array {} if the given object does not contain
* the requested information.
@@ -130,21 +130,21 @@
* find all instance variable or method names for a given object.
*
* If specified, the following table shows the values for <nClassType>
* that allow you to distinguish between DATA and CLASSDATA:
* that allow you to distinguish between VAR and CLASS VAR:
*
* <table>
* hboo.ch Value Meaning
*
* HB_MSGLISTALL 0 All types
* HB_MSGLISTCLASS 1 CLASSDATA only
* HB_MSGLISTPURE 2 DATA only
* HB_MSGLISTCLASS 1 CLASS VAR only
* HB_MSGLISTPURE 2 VAR only
* </table>
*
* DATA are instance variable usable within each object from a class,
* where each object has its own DATAs.
* VAR are instance variable usable within each object from a class,
* where each object has its own VARs.
*
* CLASSDATA are shared by all objects from a Class, so the changed
* value within Object1 will be reflected when accessing the CLASSDATA
* CLASS VAR are shared by all objects from a Class, so the changed
* value within Object1 will be reflected when accessing the CLASS VAR
* from Object2.
* $EXAMPLES$
* // show information about TBrowse class
@@ -153,10 +153,10 @@
* aClassData := __objGetMsgList( oB, .T., HB_MSGLISTCLASS )
* aMethod := __objGetMsgList( oB, .F. )
* FOR i := 1 TO Len( aData )
* ? "DATA name:", aData[ i ]
* ? "VAR name:", aData[ i ]
* NEXT
* FOR i := 1 TO Len( aClassData )
* ? "CLASSDATA name:", aClassData[ i ]
* ? "CLASS VAR name:", aClassData[ i ]
* NEXT
* FOR i := 1 TO Len( aMethod )
* ? "METHOD name:", aMethod[ i ]
@@ -224,22 +224,22 @@
* $SUBCATEGORY$
* Objects
* $ONELINER$
* Return an array of DATA names and values for a given object
* Return an array of VAR names and values for a given object
* $SYNTAX$
* __objGetValueList( <oObject>, [<aExcept>] ) --> aData
* $ARGUMENTS$
* <oObject> is an object to scan.
*
* <aExcept> is an optional array with DATA names you want to exclude
* <aExcept> is an optional array with VAR names you want to exclude
* from the scan.
* $RETURNS$
* __objGetValueList() return a 2D array that contain pairs of a DATA
* symbol name and the value of DATA. __objGetValueList() would return
* __objGetValueList() return a 2D array that contain pairs of a VAR
* symbol name and the value of VAR. __objGetValueList() would return
* an empty array {} if the given object does not contain the requested
* information.
* $DESCRIPTION$
* __objGetValueList() is a low level class support function that
* return an array with DATA names and value, each array element is a
* return an array with VAR names and value, each array element is a
* pair of: aData[ i, HB_OO_DATA_SYMBOL ] contain the symbol name
* aData[ i, HB_OO_DATA_VALUE ] contain the value of DATA
* $EXAMPLES$
@@ -247,8 +247,8 @@
* oB := TBrowseNew( 0, 0, 24, 79 )
* aData := __objGetValueList( oB )
* FOR i := 1 TO len( aData )
* ? "DATA name:", aData[ i, HB_OO_DATA_SYMBOL ], ;
* " value=", aData[ i, HB_OO_DATA_VALUE ]
* ? "VAR name:", aData[ i, HB_OO_DATA_SYMBOL ], ;
* " value=", aData[ i, HB_OO_DATA_VALUE ]
* NEXT
* $STATUS$
* R
@@ -272,7 +272,7 @@
* $SUBCATEGORY$
* Objects
* $ONELINER$
* Set object with an array of DATA names and values
* Set object with an array of VAR names and values
* $SYNTAX$
* __ObjSetValueList( <oObject>, <aData> ) --> oObject
* $ARGUMENTS$
@@ -429,21 +429,21 @@
* $SUBCATEGORY$
* Objects
* $ONELINER$
* Add a DATA to an already existing class
* Add a VAR to an already existing class
* $SYNTAX$
* __objAddData( <oObject>, <cDataName> ) --> oObject
* $ARGUMENTS$
* <oObject> is the object to work on.
*
* <cDataName> is the symbol name of the new DATA to add.
* <cDataName> is the symbol name of the new VAR to add.
* $RETURNS$
* __objAddData() return a reference to <oObject>.
* $DESCRIPTION$
* __objAddData() is a low level class support function that add a new
* DATA to an object. <oObject> is unchanged if a symbol with the name
* VAR to an object. <oObject> is unchanged if a symbol with the name
* <cDataName> already exist in <oObject>.
* $EXAMPLES$
* // create a new THappy class and add a lHappy DATA
* // create a new THappy class and add a lHappy VAR
* oHappy := HBClass():New( "THappy" )
* __objAddData( oHappy, "lHappy" )
* oHappy:lHappy := .T.
@@ -704,26 +704,26 @@
* $SUBCATEGORY$
* Objects
* $ONELINER$
* Delete a DATA (instance variable) from class
* Delete a VAR (instance variable) from class
* $SYNTAX$
* __objDelMethod( <oObject>, <cDataName> ) --> oObject
* $ARGUMENTS$
* <oObject> is the object to work on.
*
* <cDataName> is the symbol name of DATA to be deleted (removed) from
* <cDataName> is the symbol name of VAR to be deleted (removed) from
* the object.
* $RETURNS$
* __objDelData() return a reference to <oObject>.
* $DESCRIPTION$
* __objDelData() is a low level class support function that delete
* (remove) a DATA from an object. <oObject> is unchanged if a symbol
* (remove) a VAR from an object. <oObject> is unchanged if a symbol
* with the name <cDataName> does not exist in <oObject>.
* $EXAMPLES$
* // create a new THappy class and add a lHappy DATA
* // create a new THappy class and add a lHappy VAR
* oHappy := HBClass():New( "THappy" )
* __objAddData( oHappy, "lHappy" )
* ? __objHasData( oHappy, "lHappy" ) // .T.
* // remove lHappy DATA
* // remove lHappy VAR
* __objDelData( oHappy, "lHappy" )
* ? __objHasData( oHappy, "lHappy" ) // .F.
* $STATUS$

20
harbour/extras/gtwvw/tests/drawimg.prg
View File

@@ -160,24 +160,24 @@ PROCEDURE Main()
/*********************************************************/
CLASS wGUIObj
CREATE CLASS wGUIObj
DATA nWinNum //parent window's number
DATA lVisible //is the object visible
DATA nType //Type
DATA cId //Id
DATA nRow1, nCol1, nRow2, nCol2 //mouse object region
DATA aOffTLBR //offset in pixels
VAR nWinNum //parent window's number
VAR lVisible //is the object visible
VAR nType //Type
VAR cId //Id
VAR nRow1, nCol1, nRow2, nCol2 //mouse object region
VAR aOffTLBR //offset in pixels
ENDCLASS
/*********************************************************/
CLASS wPaintObj FROM wGUIObj
CREATE CLASS wPaintObj FROM wGUIObj
// image like wvtimage
DATA cImage
DATA lTransp
VAR cImage
VAR lTransp
METHOD New()
METHOD Draw()

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

@@ -65,33 +65,33 @@ STATIC s_nrepeatdelay := 0.5
// WVWMouseButton
//**************************************************************
CLASS WVWMouseButton
CREATE CLASS WVWMouseButton
// DATA nId /* TODO */ //mouse object id
// DATA nHotKey /* TODO */ //hotkey associated with this object
DATA nWinId //20040303, parent window's number
DATA lVisible //is the object visible
DATA lEnable //20040303, is the object enable
DATA lTight //allow tight neighboring
DATA nType //20040303, appearance of this button
DATA nRow1, nCol1, nRow2, nCol2 //mouse object region
// VAR nId /* TODO */ //mouse object id
// VAR nHotKey /* TODO */ //hotkey associated with this object
VAR nWinId //20040303, parent window's number
VAR lVisible //is the object visible
VAR lEnable //20040303, is the object enable
VAR lTight //allow tight neighboring
VAR nType //20040303, appearance of this button
VAR nRow1, nCol1, nRow2, nCol2 //mouse object region
DATA bClickBlock //executed on Left Click
DATA bPressBlock //executed on Left Press
VAR bClickBlock //executed on Left Click
VAR bPressBlock //executed on Left Press
DATA lRepeatPress //repeat Left Press when pressed during mouse over?
VAR lRepeatPress //repeat Left Press when pressed during mouse over?
DATA cCaption
DATA cCaptionFont //font name for caption
DATA nCaptionHeight //height of font for caption, if NIL use current wvw_getfontinfo()
DATA cImage //20040325, image file name
VAR cCaption
VAR cCaptionFont //font name for caption
VAR nCaptionHeight //height of font for caption, if NIL use current wvw_getfontinfo()
VAR cImage //20040325, image file name
DATA cNormalColor //button normal color, pls use single color, eg "W"
DATA cPressedColor //button pressed color, pls use single color, eg "B"
VAR cNormalColor //button normal color, pls use single color, eg "W"
VAR cPressedColor //button pressed color, pls use single color, eg "B"
// private DATA, should be protected
DATA lPressed //is it being pressed by Left Button?
DATA lHover //20040303, is mouse over the button?
VAR lPressed //is it being pressed by Left Button?
VAR lHover //20040303, is mouse over the button?
// METHODS
METHOD New( cCaption, nRow1, nCol1, nRow2, nCol2, bClickBlock, nType, lDraw, nWinId )

14
harbour/extras/hbdoc/genbase.prg
View File

@@ -64,11 +64,11 @@ CREATE CLASS TPLGenerate
EXPORTED:
//~ PROTECTED:
DATA nHandle AS NUMERIC
DATA cFolder AS STRING
DATA cFilename AS STRING
DATA cTitle AS STRING
DATA cExtension AS STRING
VAR nHandle AS NUMERIC
VAR cFolder AS STRING
VAR cFilename AS STRING
VAR cTitle AS STRING
VAR cExtension AS STRING
METHOD NewIndex( cFolder, cFilename, cTitle, cExtension )
METHOD NewDocument( cFolder, cFilename, cTitle, cExtension )
@@ -81,8 +81,8 @@ CREATE CLASS TPLGenerate
PROTECTED:
METHOD New( cFolder, cFilename, cTitle, cExtension, nType ) HIDDEN
DATA nType AS INTEGER
DATA Depth AS INTEGER INIT 0
VAR nType AS INTEGER
VAR Depth AS INTEGER INIT 0
ENDCLASS
METHOD NewIndex( cFolder, cFilename, cTitle, cExtension ) CLASS TPLGenerate

6
harbour/extras/hbdoc/genhtml.prg
View File

@@ -63,7 +63,7 @@
#define EXTENSION ".html"
#endif
CLASS GenerateHTML2 FROM GenerateHTML
CREATE CLASS GenerateHTML2 FROM GenerateHTML
METHOD NewIndex( cFolder, cFilename, cTitle )
METHOD NewDocument( cFolder, cFilename, cTitle )
ENDCLASS
@@ -85,8 +85,8 @@ CREATE CLASS GenerateHTML FROM TPLGenerate
METHOD Append( cText, cFormat )
METHOD Newline() INLINE FWrite( ::nHandle, "<br />" + hb_eol() ), self
CLASSDATA lCreateStyleDocument AS LOGICAL INIT .T.
DATA TargetFilename AS STRING INIT ""
CLASS VAR lCreateStyleDocument AS LOGICAL INIT .T.
VAR TargetFilename AS STRING INIT ""
EXPORTED:
METHOD NewFile() HIDDEN

4
harbour/extras/hbdoc/gentxt.prg
View File

@@ -72,11 +72,11 @@ METHOD NewIndex( cFolder, cFilename, cTitle, cDescription ) CLASS GenerateAscii
super:NewIndex( cFolder, cFilename, cTitle, cDescription )
RETURN self
CLASS GenerateText FROM TPLGenerate
CREATE CLASS GenerateText FROM TPLGenerate
HIDDEN:
PROTECTED:
DATA lContinuous AS LOGICAL INIT .F.
VAR lContinuous AS LOGICAL INIT .F.
EXPORTED:
METHOD NewIndex( cFolder, cFilename, cTitle )

18
harbour/extras/hbdoc/tmplates.prg
View File

@@ -62,7 +62,7 @@ CREATE CLASS Entry
EXPORTED:
CLASSDATA Fields AS ARRAY INIT { ;
CLASS VAR Fields AS ARRAY INIT { ;
{ "DOC", "Doc" }, ;
{ "TEMPLATE", "Template" }, ;
{ "NAME", "" }, ;
@@ -98,7 +98,7 @@ CREATE CLASS Entry
// this is best viewed with a fixed-width font
// the columns of this array correspond to the elements of Fields
CLASSDATA Templates AS ARRAY INIT { ;
CLASS VAR Templates AS ARRAY INIT { ;
{ "Template" , { S, T, x+U, x, O , x+U, x+U, x+U, x+U, x+U, x+U, x+U, x+U, x+U, x +U, x +U, x+U, x+U, x+U, x+U, x+U, E } }, ;
{ "Document" , { S, T, R+U, R, O+U, O+U, x+U, x+U, x+U, R+U, x+U, x+U, x+U, x+U, x +U, x +U, x+U, x+U, O+U, O+U, O+U, E } }, ;
{ "Function" , { S, T, R+U, R, R , O+U, O+U, O+U, O+U, O+U, x+U, x+U, x+U, x+U, P+O+U, P+O+U, O+U, O+U, O+U, O+U, O+U, E } }, ;
@@ -134,13 +134,13 @@ CREATE CLASS Entry
METHOD CategoryIndex( cCategory )
METHOD SubcategoryIndex( cCategory, cSubcategory )
DATA Group AS ARRAY
DATA filename AS STRING
DATA type_ AS STRING
DATA sourcefile_ AS STRING
DATA sourcefileversion_ AS STRING
DATA uid_ AS STRING
CLASSDATA uid__ AS INTEGER INIT 0
VAR Group AS ARRAY
VAR filename AS STRING
VAR type_ AS STRING
VAR sourcefile_ AS STRING
VAR sourcefileversion_ AS STRING
VAR uid_ AS STRING
CLASS VAR uid__ AS INTEGER INIT 0
ENDCLASS
METHOD New( cType ) CLASS Entry

18
harbour/extras/httpsrv/cookie.prg
View File

@@ -60,15 +60,15 @@ RETURN uhttpd_Cookie():New( cDomain, cPath, nExpireDays, nExpireSecs )
CLASS uhttpd_Cookie
// Data for cookies
DATA aCookies INIT {} // Using an array to mantain order
DATA cDomain
DATA cPath INIT "/"
DATA cExpire
DATA lSecure INIT .F.
DATA lHttpOnly
DATA nExpireDays INIT 0
DATA nExpireSecs INIT 7200 // 1 hour - TODO set environment constant
DATA lCookiesSent INIT .F.
VAR aCookies INIT {} // Using an array to mantain order
VAR cDomain
VAR cPath INIT "/"
VAR cExpire
VAR lSecure INIT .F.
VAR lHttpOnly
VAR nExpireDays INIT 0
VAR nExpireSecs INIT 7200 // 1 hour - TODO set environment constant
VAR lCookiesSent INIT .F.
METHOD SetCookie()
METHOD DeleteCookie()

2
harbour/extras/httpsrv/modules/tableservletdb.prg
View File

@@ -128,7 +128,7 @@ FUNCTION HRBMAIN()
CLASS TableManager
CLASSVAR ROWS_PER_PAGE INIT 23
CLASS VAR ROWS_PER_PAGE INIT 23
VAR aData INIT {}

60
harbour/extras/httpsrv/session.prg
View File

@@ -104,40 +104,40 @@ CLASS uhttpd_Session
HIDDEN:
DATA oCookie
DATA cSID
DATA cSavePath INIT "/tmp"
DATA cName // INIT "SESSIONID"
DATA lAuto_Start INIT .F. // .F. = no autostart
DATA nGc_Probability INIT 33 // Every 1/3 of checks i'll lunch Session GC
DATA nGc_MaxLifeTime INIT 1440 // seconds - Number of seconds after gc can delete a session
// DATA cSerialize_Handler INIT "HBHTMLLIB"
DATA nCookie_LifeTime INIT 3600 //0 // Number of seconds to keep cookie, 0 = until browser is closed
DATA cCookie_Path INIT "/"
DATA cCookie_Domain
DATA lCookie_Secure INIT .F.
DATA lUse_Cookies INIT .T. // .T. = Use cookies to store session id on client side
DATA lUse_Only_Cookies INIT .F.
DATA cReferrer_Check // If is set check if referrer is equal to, if it isn't block
// DATA cEntropy_File
// DATA nEntropy_Lenght
DATA cCache_Limiter INIT "nocache" // Possible values are: none, nocache, private, private_no_expire, public
DATA nCache_Expire INIT 180 // in minutes, not checked if cCache_Limiter == none or nocache
DATA lUse_Trans_SID INIT .F. // .F. = no SID appended to URL
VAR oCookie
VAR cSID
VAR cSavePath INIT "/tmp"
VAR cName // INIT "SESSIONID"
VAR lAuto_Start INIT .F. // .F. = no autostart
VAR nGc_Probability INIT 33 // Every 1/3 of checks i'll lunch Session GC
VAR nGc_MaxLifeTime INIT 1440 // seconds - Number of seconds after gc can delete a session
// VAR cSerialize_Handler INIT "HBHTMLLIB"
VAR nCookie_LifeTime INIT 3600 //0 // Number of seconds to keep cookie, 0 = until browser is closed
VAR cCookie_Path INIT "/"
VAR cCookie_Domain
VAR lCookie_Secure INIT .F.
VAR lUse_Cookies INIT .T. // .T. = Use cookies to store session id on client side
VAR lUse_Only_Cookies INIT .F.
VAR cReferrer_Check // If is set check if referrer is equal to, if it isn't block
// VAR cEntropy_File
// VAR nEntropy_Lenght
VAR cCache_Limiter INIT "nocache" // Possible values are: none, nocache, private, private_no_expire, public
VAR nCache_Expire INIT 180 // in minutes, not checked if cCache_Limiter == none or nocache
VAR lUse_Trans_SID INIT .F. // .F. = no SID appended to URL
// Session Storage code blocks
DATA bOpen //INIT {| cPath, cName | ::SessionOpen( cPath, cName ) }
DATA bClose //INIT {|| ::SessionClose() }
DATA bRead //INIT {| cID | ::SessionRead( cID ) }
DATA bWrite //INIT {| cID, cData | ::SessionWrite( cID, cData ) }
DATA bDestroy //INIT {| cID | ::SessionDestroy( cID ) }
DATA bGC //INIT {| nMaxLifeTime | ::SessionGC( nMaxLifeTime ) }
DATA nFileRetry INIT 10 // How many time try to open / write / delete file in case of error
DATA nFileWait INIT 500 // How many milliseconds have to wait before retry
VAR bOpen //INIT {| cPath, cName | ::SessionOpen( cPath, cName ) }
VAR bClose //INIT {|| ::SessionClose() }
VAR bRead //INIT {| cID | ::SessionRead( cID ) }
VAR bWrite //INIT {| cID, cData | ::SessionWrite( cID, cData ) }
VAR bDestroy //INIT {| cID | ::SessionDestroy( cID ) }
VAR bGC //INIT {| nMaxLifeTime | ::SessionGC( nMaxLifeTime ) }
VAR nFileRetry INIT 10 // How many time try to open / write / delete file in case of error
VAR nFileWait INIT 500 // How many milliseconds have to wait before retry
DATA nActiveSessions INIT 0
VAR nActiveSessions INIT 0
DATA lSessionActive INIT .F.
VAR lSessionActive INIT .F.
METHOD GenerateSID()
METHOD CheckSID()

2
harbour/tests/testdecl.prg
View File

@@ -23,7 +23,7 @@ DECLARE SomeFunc( OPTIONAL SomeVar AS STRING )
//DECLARE SomeFunc( OPTIONAL SomeVar AS STRING, OPTIONAL OtherVar )
CLASS MyClass
CREATE CLASS MyClass
METHOD New() Constructor
VAR While AS STRING
VAR cVar AS STRING