From 0ad7ef4b7e94ed47f940fa1bba1dd9138778fbf3 Mon Sep 17 00:00:00 2001 From: Chen Kedem Date: Tue, 5 Jun 2007 06:56:52 +0000 Subject: [PATCH] 2007-06-05 09:56 UTC+0300 Chen Kedem --- harbour/ChangeLog | 5 +++++ harbour/source/rtl/achoice.prg | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f2de7c2c58..32897bbfb7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-06-05 09:56 UTC+0300 Chen Kedem + * source/rtl/achoice.prg + ! Fix bug#1729881 by + ACHOICE() was not handling AC_GOTO when user function was used. + 2007-06-05 03:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbzlib/zip.c * cleaned some warnings diff --git a/harbour/source/rtl/achoice.prg b/harbour/source/rtl/achoice.prg index 59241833dc..58c984a44f 100644 --- a/harbour/source/rtl/achoice.prg +++ b/harbour/source/rtl/achoice.prg @@ -457,10 +457,10 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo CASE nUserFunc == AC_GOTO // Do nothing. The next keystroke won't be read and // this keystroke will be processed as a goto. - nMode := AC_GOTO + nMode := AC_GOTO ENDCASE - IF nPos > 0 + IF nPos > 0 .AND. nMode != AC_GOTO nRowsClr := Min( nNumRows, nItems ) nMode := Ach_Limits( @nFrstItem, @nLastItem, @nItems, bSelect, alSelect, acItems )