first pass

[PuTTY.git] / windows / winctrls.c

diff --git a/windows/winctrls.c b/windows/winctrls.c
index a08771775ec18b8cdc4ea416802be110c262bce9..a03967e6f81917a07e9669ea89448ba9b57098d7 100644 (file)
--- a/windows/winctrls.c
+++ b/windows/winctrls.c
@@ -76,7 +76,7 @@ HWND doctl(struct ctlpos *cp, RECT r,
     if (cp->hwnd) {
        ctl = CreateWindowEx(exstyle, wclass, wtext, wstyle,
                             r.left, r.top, r.right, r.bottom,
-                            cp->hwnd, (HMENU) wid, hinst, NULL);
+                            cp->hwnd, (HMENU)(ULONG_PTR)wid, hinst, NULL);
        SendMessage(ctl, WM_SETFONT, cp->font, MAKELPARAM(TRUE, 0));
 
        if (!strcmp(wclass, "LISTBOX")) {
@@ -301,6 +301,7 @@ void bareradioline(struct ctlpos *cp, int nacross, ...)
        if (!btext)
            break;
        (void) va_arg(ap, int); /* id */
+        nbuttons++;
     }
     va_end(ap);
     buttons = snewn(nbuttons, struct radio);
@@ -331,6 +332,7 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...)
        if (!btext)
            break;
        (void) va_arg(ap, int); /* id */
+        nbuttons++;
     }
     va_end(ap);
     buttons = snewn(nbuttons, struct radio);