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

2012-11-06 21:38 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/gtwvg/gtwvg.hbx
    * cleanups

  * ChangeLog
    ! missed this entry from prev patch:

      * contrib/hbformat/hbfmtcls.prg
        + Committed Maurizio's latest patch (#5)
          Many thanks for this great work to Maurizio.
          It resolves a great number of problems.

  * contrib/hbformat/hbfmtcls.prg
    ! fix for line ending spaces remaining after formatting
    * fixed few formatting for the recent patch

  * contrib/hbformat/hbformat.hbx
    * formatted new function name
This commit is contained in:
Viktor Szakats
2012-11-06 20:48:10 +00:00
parent 4946c47624
commit 00edba46ae
4 changed files with 89 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
harbour/ChangeLog
View File

@@ -16,6 +16,25 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-06 21:38 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/gtwvg/gtwvg.hbx
* cleanups
* ChangeLog
! missed this entry from prev patch:
* contrib/hbformat/hbfmtcls.prg
+ Committed Maurizio's latest patch (#5)
Many thanks for this great work to Maurizio.
It resolves a great number of problems.
* contrib/hbformat/hbfmtcls.prg
! fix for line ending spaces remaining after formatting
* fixed few formatting for the recent patch
* contrib/hbformat/hbformat.hbx
* formatted new function name
2012-11-06 21:31 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbformat/hbfuncs.prg
! fixed typo in processing names from .hbr
@@ -24,6 +43,11 @@
* contrib/hbct/hbct.hbx
* minor cleanup
* contrib/hbformat/hbfmtcls.prg
+ Committed Maurizio's latest patch (#5)
Many thanks for this great work to Maurizio.
It resolves a great number of problems.
+ contrib/hbformat/hbfuncs.prg
* contrib/hbformat/hbfmtcls.prg
* contrib/hbformat/hbformat.hbp

106
harbour/contrib/gtwvg/gtwvg.hbx
View File

@@ -27,39 +27,39 @@
#command DYNAMIC <fncs,...> => EXTERNAL <fncs>
#endif
DYNAMIC TBrowseWVG
DYNAMIC WVG3State
DYNAMIC WVGActiveXControl
DYNAMIC WVGBitmap
DYNAMIC WVGCheckBox
DYNAMIC WVGComboBox
DYNAMIC WVGCrt
DYNAMIC WVGDataRef
DYNAMIC WVGDialog
DYNAMIC WVGDrawingArea
DYNAMIC WVGFont
DYNAMIC WVGFontDialog
DYNAMIC WVGHtmlViewer
DYNAMIC WVGListBox
DYNAMIC WVGMenu
DYNAMIC WVGMenuBar
DYNAMIC WVGMle
DYNAMIC WVGPartHandler
DYNAMIC WVGPushButton
DYNAMIC WVGRadioButton
DYNAMIC WVGScrollBar
DYNAMIC WVGSetAppWindow
DYNAMIC WVGSLE
DYNAMIC WVGStatic
DYNAMIC WVGStatusBar
DYNAMIC WVGStatusBarPanel
DYNAMIC WVGSysWindow
DYNAMIC WVGTabPage
DYNAMIC WVGToolBar
DYNAMIC WVGToolBarButton
DYNAMIC WVGTreeView
DYNAMIC WVGTreeViewItem
DYNAMIC WVGWindow
DYNAMIC TBrowseWvg
DYNAMIC Wvg3State
DYNAMIC WvgActiveXControl
DYNAMIC WvgBitmap
DYNAMIC WvgCheckBox
DYNAMIC WvgComboBox
DYNAMIC WvgCrt
DYNAMIC WvgDataRef
DYNAMIC WvgDialog
DYNAMIC WvgDrawingArea
DYNAMIC WvgFont
DYNAMIC WvgFontDialog
DYNAMIC WvgHtmlViewer
DYNAMIC WvgListBox
DYNAMIC WvgMenu
DYNAMIC WvgMenuBar
DYNAMIC WvgMle
DYNAMIC WvgPartHandler
DYNAMIC WvgPushButton
DYNAMIC WvgRadioButton
DYNAMIC WvgScrollBar
DYNAMIC WvgSetAppWindow
DYNAMIC WvgSLE
DYNAMIC WvgStatic
DYNAMIC WvgStatusBar
DYNAMIC WvgStatusBarPanel
DYNAMIC WvgSysWindow
DYNAMIC WvgTabPage
DYNAMIC WvgToolBar
DYNAMIC WvgToolBarButton
DYNAMIC WvgTreeView
DYNAMIC WvgTreeViewItem
DYNAMIC WvgWindow
DYNAMIC Wvg_AddToolbarButton
DYNAMIC Wvg_And
DYNAMIC Wvg_AppendMenu
@@ -215,26 +215,26 @@ DYNAMIC Wvg_TreeView_SetTextColor
DYNAMIC Wvg_TreeView_ShowExpanded
DYNAMIC Wvg_TVIS_Expanded
DYNAMIC Wvg_UpdateWindow
DYNAMIC WVTBanner
DYNAMIC WVTBrowse
DYNAMIC WVTConsole
DYNAMIC WVTDialog
DYNAMIC WVTGets
DYNAMIC WVTImage
DYNAMIC WVTLabel
DYNAMIC WVTMenu
DYNAMIC WVTObject
DYNAMIC WVTPaintObjects
DYNAMIC WVTPanel
DYNAMIC WVTProgressBar
DYNAMIC WVTPushButton
DYNAMIC WVTScrollBar
DYNAMIC WVTSetPaint
DYNAMIC WVTStatic
DYNAMIC WVTStatusBar
DYNAMIC WVTTextBox
DYNAMIC WVTToolBar
DYNAMIC WVTToolButton
DYNAMIC WvtBanner
DYNAMIC WvtBrowse
DYNAMIC WvtConsole
DYNAMIC WvtDialog
DYNAMIC WvtGets
DYNAMIC WvtImage
DYNAMIC WvtLabel
DYNAMIC WvtMenu
DYNAMIC WvtObject
DYNAMIC WvtPaintObjects
DYNAMIC WvtPanel
DYNAMIC WvtProgressBar
DYNAMIC WvtPushButton
DYNAMIC WvtScrollBar
DYNAMIC WvtSetPaint
DYNAMIC WvtStatic
DYNAMIC WvtStatusBar
DYNAMIC WvtTextBox
DYNAMIC WvtToolBar
DYNAMIC WvtToolButton
DYNAMIC Wvt_AddDlgItem
DYNAMIC Wvt_AppendMenu
DYNAMIC Wvt_CBAddString

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

@@ -274,20 +274,20 @@ METHOD Reformat( aFile ) CLASS HBFORMATCODE
ENDIF
ENDIF
IF nPosComment > 0
nPos := nPosComment + iif( SubStr( cLineAll, nPosComment, 1) == "*", 1, 2 )
if SubStr( cLineAll, nPos, 1 ) != " "
cLineAll := Left( cLineAll, nPos - 1) + " " + SubStr( cLineAll, nPos )
endif
endif
nPos := nPosComment + iif( SubStr( cLineAll, nPosComment, 1 ) == "*", 1, 2 )
IF SubStr( cLineAll, nPos, 1 ) != " "
cLineAll := Left( cLineAll, nPos - 1 ) + " " + SubStr( cLineAll, nPos )
ENDIF
ENDIF
IF ( nPos := FindNotQuoted( "/*", cLineAll ) ) != 0 .AND. ( nPosComment == 0 .OR. nPosComment > nPos )
nPosComment := nPos
IF hb_At( "*/", cLineAll, nPos + 2 ) == 0
lComment := .T.
ENDIF
ENDIF
if nPosComment == 1 .AND. nDeep == 0 .and. nState == RF_STATE_RET
IF nPosComment == 1 .AND. nDeep == 0 .AND. nState == RF_STATE_RET
nState := 0
endif
ENDIF
IF ! lPragmaDump .AND. ::lIndent .AND. ! lComment
aFile[ i ] := cLineAll
IF ! lContinue
@@ -365,7 +365,7 @@ METHOD Reformat( aFile ) CLASS HBFORMATCODE
IF nState > 0
nState := RF_STATE_CODE
ENDIF
IF ( nContrState := Ascan( ::aContr, ;
IF ( nContrState := AScan( ::aContr, ;
{| a | a[ 1 ] == cToken1 .AND. ( Empty( a[ 2 ] ) .OR. a[ 2 ] == cToken2 ) } ) ) != 0
IF Len( aDeep ) < ++nDeep
AAdd( aDeep, NIL )
@@ -375,7 +375,7 @@ METHOD Reformat( aFile ) CLASS HBFORMATCODE
IF ( nPos := AScan( ::aContr, {| a | a[ 4 ] == cToken1 } ) ) > 0 .OR. ;
cToken1 == "end"
IF nPos != 0 .AND. nDeep > 0 .AND. aDeep[ nDeep ] != nPos
DO WHILE ( nPos := Ascan( ::aContr, {| a | a[ 4 ] == cToken1 }, ;
DO WHILE ( nPos := AScan( ::aContr, {| a | a[ 4 ] == cToken1 }, ;
nPos + 1 ) ) != 0 .AND. aDeep[ nDeep ] != nPos
ENDDO
ENDIF
@@ -436,7 +436,7 @@ METHOD Reformat( aFile ) CLASS HBFORMATCODE
IF nState == RF_STATE_RET
IF lClass
lClass := .F.
endif
ENDIF
nState := 0
ENDIF
IF nPosSep == 0 .OR. nPosSep == Len( aFile[ i ] )
@@ -852,7 +852,7 @@ METHOD Array2Source( aSource ) CLASS HBFORMATCODE
EXIT
ENDIF
IF i < nLen .OR. ! Empty( aSource[ i ] )
cSource += aSource[ i ] + ::cEol
cSource += RTrim( aSource[ i ] ) + ::cEol
ENDIF
NEXT

2
harbour/contrib/hbformat/hbformat.hbx
View File

@@ -26,7 +26,7 @@
#endif
DYNAMIC HBFormatCode
DYNAMIC __HBFORMAT_BUILDLISTOFFUNCTIONS
DYNAMIC __hbformat_BuildListOfFunctions
#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBFORMAT__REQUEST )
#uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>