From 5892ce3e728f68088b9cac4d51446d8bf66741d1 Mon Sep 17 00:00:00 2001
From: Luiz Rafael Culik <culik@sl.conex.net>
Date: Wed, 28 Aug 2002 00:42:16 +0000
Subject: [PATCH] See changelog 2002-08-27 21:30 UTC-0300

---
 harbour/makefile.bc            | 10 +++++++++-
 harbour/makefile.vc            |  1 +
 harbour/source/rtl/achoice.prg |  8 ++++++--
 harbour/source/rtl/dummy.prg   |  1 -
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 42ddb88d08..f7231b77f6 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -449,6 +449,7 @@ RDD_LIB_OBJS = \
    $(OBJ_DIR)\sdf1.obj \
    \
    $(OBJ_DIR)\dbf0.obj \
+   $(OBJ_DIR)\dbtotal.obj \
    $(OBJ_DIR)\dbfuncs.obj \
    $(OBJ_DIR)\dblist.obj \
    $(OBJ_DIR)\dbsort.obj \
@@ -954,6 +955,13 @@ $(OBJ_DIR)\dbf1.obj : $(RDD_DIR)\dbf1.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(RDD_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\dbtotal.c : $(RDD_DIR)\dbtotal.prg
+   $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
+
+$(OBJ_DIR)\dbtotal.obj : $(OBJ_DIR)\dbtotal.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(RDD_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\dblist.c : $(RDD_DIR)\dblist.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
@@ -2708,4 +2716,4 @@ $(OBJ_DIR)\prb_stak.obj : $(OBJ_DIR)\prb_stak.c
    $(CC) $(CLIBFLAGS) -o$@ $**
 
 $(OBJ_DIR)\hbmlang.obj : $(HBMAKE_DIR)\hbmlang.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
\ No newline at end of file
+   $(CC) $(CLIBFLAGS) -o$@ $**
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index e608b7ebea..09c90e18f6 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -506,6 +506,7 @@ RDD_LIB_OBJS = \
    $(OBJ_DIR)\sdf1.obj \
    \
    $(OBJ_DIR)\dbf0.obj \
+   $(OBJ_DIR)\dbtotal.obj \
    $(OBJ_DIR)\dbfuncs.obj \
    $(OBJ_DIR)\dblist.obj \
    $(OBJ_DIR)\dbsort.obj \
diff --git a/harbour/source/rtl/achoice.prg b/harbour/source/rtl/achoice.prg
index b12c75188c..528cc5161c 100644
--- a/harbour/source/rtl/achoice.prg
+++ b/harbour/source/rtl/achoice.prg
@@ -64,10 +64,14 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
    DEFAULT nHiLiteRow TO 0                 // The row to be highlighted
 
    IF nRight == 79 .and. nLeft ==0
-      nNumCols := 79
+      nNumCols := 80  
    ELSE
       nNumCols := nRight - nLeft + 1
    ENDIF
+
+   IF nRight > MaxCol()
+      nRight--
+   ENDIF
    nNumRows := nBottom - nTop + 1
 
 
@@ -508,7 +512,7 @@ STATIC PROCEDURE DispPage( acItems, alSelect, nTop, nLeft, nRight, nNumRows, nPo
    Default nRowsClr to nNumRows
 
    IF nRight == 79 .and. nLeft == 0
-      nRightPos := nRight
+      nRightPos := 80
    ELSE                            
       nRightPos := nRight - nLeft + 1 
    ENDIF
diff --git a/harbour/source/rtl/dummy.prg b/harbour/source/rtl/dummy.prg
index 95ca34607c..4a01c8c338 100644
--- a/harbour/source/rtl/dummy.prg
+++ b/harbour/source/rtl/dummy.prg
@@ -64,7 +64,6 @@ FUNCTION ordSkipUnique()   ; RETURN .F.
 #endif
 
 FUNCTION __dbJoin()        ; RETURN NIL
-FUNCTION __dbTotal()       ; RETURN NIL
 
 /* NOTE: Internal functions */
 FUNCTION __dbFList()       ; RETURN {}