From 25b9dd471b02847a646237ad5888f0f1186917ad Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Thu, 12 Apr 2012 23:32:28 +0200
Subject: [PATCH] Fix promotion popup
The new GenericPopUp did not like it if the first button had 'SAME_ROW' set.
---
dialogs.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dialogs.c b/dialogs.c
index 586e628..c8c7fc2 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -1454,13 +1454,13 @@ static int count;
static void PromoPick P((int n));
static Option promoOptions[] = {
-{ 0, 0, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
+{ 0, 0, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
{ 0, SAME_ROW | NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
};
@@ -1489,8 +1489,9 @@ PromoPick (int n)
static void
SetPromo (char *name, int nr, char promoChar)
{
- safeStrCpy(promoOptions[nr].name, name, MSG_SIZ);
+ ASSIGN(promoOptions[nr].name, name);
promoOptions[nr].value = promoChar;
+ promoOptions[nr].min = SAME_ROW;
}
void
@@ -1526,6 +1527,7 @@ PromotionPopUp ()
SetPromo(_("Defer"), --count, '=');
SetPromo(_("Promote"), --count, '+');
}
+ promoOptions[count].min = 0;
GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL, 0);
}
--
1.7.0.4