X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinctrls.c;h=a03967e6f81917a07e9669ea89448ba9b57098d7;hb=23fbc4f56b04ca5d387c16720caa05ddf2d63e2f;hp=ea1cc1825eb6e8adb88ec44b25b876329efde8f6;hpb=b266d671acee34f9305950bfd87054b3b7fcded6;p=PuTTY.git diff --git a/windows/winctrls.c b/windows/winctrls.c index ea1cc182..a03967e6 100644 --- 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")) { @@ -267,10 +267,9 @@ void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...) nbuttons = 0; while (1) { char *btext = va_arg(ap, char *); - int bid; if (!btext) break; - bid = va_arg(ap, int); + (void) va_arg(ap, int); /* id */ nbuttons++; } va_end(ap); @@ -299,10 +298,10 @@ void bareradioline(struct ctlpos *cp, int nacross, ...) nbuttons = 0; while (1) { char *btext = va_arg(ap, char *); - int bid; if (!btext) break; - bid = va_arg(ap, int); + (void) va_arg(ap, int); /* id */ + nbuttons++; } va_end(ap); buttons = snewn(nbuttons, struct radio); @@ -330,10 +329,10 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...) nbuttons = 0; while (1) { char *btext = va_arg(ap, char *); - int bid; if (!btext) break; - bid = va_arg(ap, int); + (void) va_arg(ap, int); /* id */ + nbuttons++; } va_end(ap); buttons = snewn(nbuttons, struct radio); @@ -372,7 +371,6 @@ void checkbox(struct ctlpos *cp, char *text, int id) char *staticwrap(struct ctlpos *cp, HWND hwnd, char *text, int *lines) { HDC hdc = GetDC(hwnd); - int lpx = GetDeviceCaps(hdc, LOGPIXELSX); int width, nlines, j; INT *pwidths, nfit; SIZE size;