From c882e9de0756cf7256c563d32e94305465a28526 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 8 Jan 2011 20:27:22 +0000 Subject: [PATCH] 2011-01-08 12:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpgeneric.prg ! hbxbp_SetEventLoop() - applied patch from Shum, thanks. * contrib/hbxbp/xbptoolbar.prg ! Fixed a badly ignored change in changed implementation of connection slots. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbxbp/xbpgeneric.prg | 6 ++++-- harbour/contrib/hbxbp/xbptoolbar.prg | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9259507f3c..0838274715 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-08 12:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/xbpgeneric.prg + ! hbxbp_SetEventLoop() - applied patch from Shum, thanks. + + * contrib/hbxbp/xbptoolbar.prg + ! Fixed a badly ignored change in changed implementation + of connection slots. + 2011-01-08 20:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * doc/howtosvn.txt + Added some comments to 'svn propset svn:keywords' command diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg index 23d695ecc2..75f2e1f028 100644 --- a/harbour/contrib/hbxbp/xbpgeneric.prg +++ b/harbour/contrib/hbxbp/xbpgeneric.prg @@ -142,8 +142,10 @@ FUNCTION hbxbp_ClearEventBuffer() FUNCTION hbxbp_SetEventLoop( oELoop ) LOCAL oLoop := t_oEventLoop - IF hb_isObject( oELoop ) - t_oEventLoop := oELoop + IF PCount() == 1 + IF hb_isObject( oELoop ) .OR. oELoop == NIL + t_oEventLoop := oELoop + ENDIF ENDIF RETURN oLoop diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index de6c484e64..8268be78c9 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -214,7 +214,7 @@ METHOD XbpToolbar:destroy() oBtn := aItem[ 2 ] aItem := NIL - ::disConnect( oBtn:oAction, "triggered(bool)" ) + oBtn:oAction:disConnect( "triggered(bool)" ) oBtn:oAction := NIL ELSE