From 1f1665f0cba1344beaeb45afdd317b799ad260b3 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 26 Nov 2007 16:04:16 +0000 Subject: [PATCH] 2007-11-26 08:00 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/wvtcore.c ! Fixed side effects of copy/paste in hb_wvt_gtDlgProcModal(). * harbour/contrib/gtwvg/wvtclass.prg * Changed cCaption[1] to left( cCaption,1 ) to work without xhb.lib. --- harbour/contrib/gtwvg/wvtclass.prg | 2 +- harbour/contrib/gtwvg/wvtcore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/harbour/contrib/gtwvg/wvtclass.prg b/harbour/contrib/gtwvg/wvtclass.prg index a03b7e7c4b..88e01445db 100644 --- a/harbour/contrib/gtwvg/wvtclass.prg +++ b/harbour/contrib/gtwvg/wvtclass.prg @@ -3335,7 +3335,7 @@ METHOD AddItem(cCaption, bAction) CLASS wvtMenu aItem:= {MF_POPUP,bAction:hMenu,cCaption,bAction} // bAction is a wvtMenu object reference ELSEIF HB_ISBLOCK(bAction) aItem:= {MF_STRING,::MenuItemId++,cCaption,bAction} // bAction is a code block to execute - ELSEIF cCaption[1]=="-" + ELSEIF left( cCaption, 1 )=="-" aItem:= {MF_SEPARATOR,0,0,NIL} ELSE //Throw( ErrorNew( "wvtMenu", 3101, "wvtMenu:AddItem()", "Argument Error", { cCaption, bAction },"WVT.PRG" ) ) diff --git a/harbour/contrib/gtwvg/wvtcore.c b/harbour/contrib/gtwvg/wvtcore.c index 739566d636..9d7b24a440 100644 --- a/harbour/contrib/gtwvg/wvtcore.c +++ b/harbour/contrib/gtwvg/wvtcore.c @@ -527,7 +527,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM w if( hb_vmRequestReenter() ) { hb_vmPushEvalSym(); - hb_vmPush( _s->pFunc[ iIndex ] ); + hb_vmPush( _s->pFuncModal[ iIndex ] ); hb_vmPushNumInt( ( HB_LONG ) ( HB_PTRDIFF ) hDlg ); hb_vmPushNumInt( message ); hb_vmPushNumInt( wParam );