restore automatic menu/list-height in whiptail

[thirdparty/newt.git] / dialogboxes.c

diff --git a/dialogboxes.c b/dialogboxes.c
index cfd37f366244fd3cbccea90104ce5a584a45face..e37cf579d0a9557217c13247f6b1955f89aa333a 100644 (file)
--- a/dialogboxes.c
+++ b/dialogboxes.c
@@ -254,13 +254,12 @@ static int mystrncpyw(char *dest, const char *src, int n, int *maxwidth)
     return i;
 }
 
-int listBox(const char * text, int height, int width, poptContext optCon,
+int listBox(const char * text, int height, int width, int listHeight, poptContext optCon,
                int flags, const char *default_item, char ** result) {
     newtComponent form = NULL, okay, tb, answer, listBox;
     newtComponent cancel = NULL;
     const char * arg;
     char * end;
-    int listHeight;
     int numItems = 0;
     int allocedItems = 5;
     int i, top;
@@ -279,11 +278,6 @@ int listBox(const char * text, int height, int width, poptContext optCon,
 
     if (itemInfo == NULL)
        goto error;
-    if (!(arg = poptGetArg(optCon)))
-       goto error;
-    listHeight = strtoul(arg, &end, 10);
-    if (*end)
-       goto error;
 
     while ((arg = poptGetArg(optCon))) {
        if (allocedItems == numItems) {
@@ -405,13 +399,12 @@ error:
     return rc;
 }
 
-int checkList(const char * text, int height, int width, poptContext optCon,
-               int useRadio, int flags, char *** selections) {
+int checkList(const char * text, int height, int width, int listHeight,
+             poptContext optCon, int useRadio, int flags, char *** selections) {
     newtComponent form = NULL, okay, tb, subform, answer;
     newtComponent sb = NULL, cancel = NULL;
     const char * arg;
     char * end;
-    int listHeight;
     int numBoxes = 0;
     int allocedBoxes = 5;
     int i;
@@ -430,11 +423,6 @@ int checkList(const char * text, int height, int width, poptContext optCon,
 
     if (cbInfo == NULL || cbStates == NULL)
        goto error;
-    if (!(arg = poptGetArg(optCon)))
-       goto error;
-    listHeight = strtoul(arg, &end, 10);
-    if (*end)
-       goto error;
 
     while ((arg = poptGetArg(optCon))) {
        if (allocedBoxes == numBoxes) {