From 2e02e7c806873a6f36d7173c8c30ad9f71681402 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 4 Jan 2011 22:26:15 +0000 Subject: [PATCH] 2011-01-04 14:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpbrowse.prg ! Changed: :addColumn( oCol ) -> RETURN SELF => RETURN oCol * contrib/hbxbp/xbpgeneric.prg ! Modified: AppEvent() now returns a numeric always. * contrib/hbxbp/xbpparthandler.prg ! A little optimization. --- harbour/ChangeLog | 10 +++++++++- harbour/contrib/hbxbp/xbpbrowse.prg | 2 +- harbour/contrib/hbxbp/xbpgeneric.prg | 2 +- harbour/contrib/hbxbp/xbpparthandler.prg | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b4c6e75003..1d7e7b69a8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,7 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ -2011-04-01 15:20 UTC+0200 Petr Chornyj (myorg63 at mail.ru) +2011-01-04 14:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/xbpbrowse.prg + ! Changed: :addColumn( oCol ) -> RETURN SELF => RETURN oCol + * contrib/hbxbp/xbpgeneric.prg + ! Modified: AppEvent() now returns a numeric always. + * contrib/hbxbp/xbpparthandler.prg + ! A little optimization. + +2011-01-04 15:20 UTC+0200 Petr Chornyj (myorg63 at mail.ru) + hbxdiff/3rd/libxdiff/_hbconf.h + Added config file placeholder. - hbxdiff/3rd/libxdiff/config.h diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 1928853b0a..a97f92412f 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -3249,7 +3249,7 @@ METHOD XbpBrowse:rightVisible() METHOD XbpBrowse:addColumn( oCol ) AAdd( ::columns, oCol ) ::doConfigure() /* QT */ - RETURN Self + RETURN oCol /* Delete a column object from a browse */ METHOD XbpBrowse:delColumn( nColumn ) diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg index 7c9b31aa4e..247f9767ce 100644 --- a/harbour/contrib/hbxbp/xbpgeneric.prg +++ b/harbour/contrib/hbxbp/xbpgeneric.prg @@ -229,7 +229,7 @@ FUNCTION NextAppEvent( mp1, mp2, oXbp ) /*----------------------------------------------------------------------*/ FUNCTION AppEvent( mp1, mp2, oXbp, nTimeout ) - LOCAL nEvent + LOCAL nEvent := 0 LOCAL nThreadID := hb_threadId() //DEFAULT nTimeout TO 0 diff --git a/harbour/contrib/hbxbp/xbpparthandler.prg b/harbour/contrib/hbxbp/xbpparthandler.prg index 0b8cd39423..794f8e3190 100644 --- a/harbour/contrib/hbxbp/xbpparthandler.prg +++ b/harbour/contrib/hbxbp/xbpparthandler.prg @@ -197,15 +197,15 @@ METHOD addAsChild() CLASS XbpPartHandler /*----------------------------------------------------------------------*/ METHOD childFromName( nNameId ) CLASS XbpPartHandler - LOCAL i, oXbp + LOCAL i FOR i := 1 TO len( ::aChildren ) - IF ::aChildren[ i ]:nNameID <> NIL .and. ::aChildren[ i ]:nNameID == nNameID - oXbp := ::aChildren[ i ] + IF ::aChildren[ i ]:nNameID <> NIL .AND. ::aChildren[ i ]:nNameID == nNameID + RETURN ::aChildren[ i ] ENDIF NEXT - RETURN oXbp + RETURN NIL /*----------------------------------------------------------------------*/