From 7551d9b39e9de0c8636dd96dd8994146bf0bfdf1 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 26 Jul 2010 22:40:58 +0000 Subject: [PATCH] 2010-07-26 15:40 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbide.prg * contrib/hbide/idebrowse.prg * contrib/hbide/ideedit.prg % Fixed: a bug in code completion flush in FIELD-> and ALIAS-> section. --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbide/hbide.prg | 2 +- harbour/contrib/hbide/idebrowse.prg | 4 ++-- harbour/contrib/hbide/ideedit.prg | 7 +++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 77477f4bb2..30f4fe6fe0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-26 15:40 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/hbide.prg + * contrib/hbide/idebrowse.prg + * contrib/hbide/ideedit.prg + % Fixed: a bug in code completion flush in FIELD-> and ALIAS-> section. + 2010-07-26 14:57 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpmenubar.prg % Fixed: a nasty bug. diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 11f694d572..9c480108a3 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -581,7 +581,7 @@ METHOD HbIde:create( aParams ) ::oXbp:handleEvent( ::nEvent, ::mp1, ::mp2 ) ENDDO - ::oBM:destroy() + DbCloseAll() #if 0 diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index 56281b86ea..47dd12fc65 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -357,7 +357,7 @@ METHOD IdeBrowseManager:fetchFldsList( cAlias ) FOR EACH aBrw IN oPanel:aBrowsers oBrw := aBrw[ SUB_BROWSER ] FOR EACH a_ IN oBrw:aStruct - aadd( aFlds, pad( a_[ 1 ], 10 ) + " (" + padc( oBrw:cTableOnly, 12 ) + ")" + str( a_:__enumIndex(),3,0 ) + ", " + a_[ 2 ] + ", " + str( a_[ 3 ],3,0 ) + ", " + hb_ntos( a_[ 4 ] ) ) + aadd( aFlds, pad( a_[ 1 ], 10 ) + " (" + padc( oBrw:cTableOnly, 12 ) + ")" + str( a_:__enumIndex(),3,0 ) + ", " + a_[ 2 ] + ", " + str( a_[ 3 ],3,0 ) + ", " + hb_ntos( a_[ 4 ] ) + " [f]" ) NEXT NEXT NEXT @@ -365,7 +365,7 @@ METHOD IdeBrowseManager:fetchFldsList( cAlias ) OTHERWISE IF ! empty( oBrw := ::getBrowserByAlias( cA ) ) FOR EACH a_ IN oBrw:aStruct - aadd( aFlds, pad( a_[ 1 ], 10 ) + " ( " + str( a_:__enumIndex(),3,0 ) + ", " + a_[ 2 ] + ", " + str( a_[ 3 ],3,0 ) + ", " + hb_ntos( a_[ 4 ] ) + " )" ) + aadd( aFlds, pad( a_[ 1 ], 10 ) + " ( " + str( a_:__enumIndex(),3,0 ) + ", " + a_[ 2 ] + ", " + str( a_[ 3 ],3,0 ) + ", " + hb_ntos( a_[ 4 ] ) + " )" + " [f]" ) NEXT ENDIF EXIT diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index bd7cfea280..7f3d230d7a 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -2223,7 +2223,10 @@ METHOD IdeEdit:parseCodeCompletion( cSyntax ) nSpc := at( " ", cSyntax ) nFun := at( "(", cSyntax ) - IF nAbr > 0 .AND. iif( nSpc == 0, .t., nAbr < nSpc ).AND. iif( nFun == 0, .t., nAbr < nFun ) + IF "[f]" $ cSyntax + cText := alltrim( substr( cSyntax, 1, nSpc ) ) + + ELSEIF nAbr > 0 .AND. iif( nSpc == 0, .t., nAbr < nSpc ).AND. iif( nFun == 0, .t., nAbr < nFun ) cText := alltrim( substr( cSyntax, nAbr + 1 ) ) ELSE @@ -2234,7 +2237,7 @@ METHOD IdeEdit:parseCodeCompletion( cSyntax ) cText := trim( cSyntax ) ENDIF ELSE - IF nFun > 0 .AND. nFun < nSpc + IF nFun > 0 .AND. iif( nSpc == 0, .t., nFun < nSpc ) cText := trim( substr( cSyntax, 1, nFun - 1 ) ) ELSE cText := trim( cSyntax )