From cf18c3f87665b293ebac72e0fe1fc8ee9f436cb0 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 7 May 2011 20:20:57 +0000 Subject: [PATCH] 2011-05-07 13:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpmenubar.prg ! Fixed: where XbpMenu() activation was not supplying the documented parameters when activated, thanks Shum for watching it closely. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbxbp/xbpmenubar.prg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 19ee7e7a6c..7e96a445a3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-07 13:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/xbpmenubar.prg + ! Fixed: where XbpMenu() activation was not supplying the documented + parameters when activated, thanks Shum for watching it closely. + 2011-05-07 11:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/vm/maindllp/dllpcode.c * readded more win specific macros (msvc didn't like it) diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index e3c7e525d9..ee30a873bb 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -505,7 +505,7 @@ METHOD xbpMenuBar:execSlot( cSlot, p ) IF ! empty( p ) .AND. ( nIndex := ascan( ::aMenuItems, {|e_| iif( hb_isNumeric( e_[ 2 ] ), e_[ 2 ] == p, .f. ) } ) ) > 0 IF cSlot == "triggered(bool)" IF hb_isBlock( ::aMenuItems[ nIndex,4 ] ) - eval( ::aMenuItems[ nIndex,4 ] ) + eval( ::aMenuItems[ nIndex,4 ], nIndex, NIL, Self ) ELSE ::itemSelected( nIndex )