Merge tag '0.66'

[PuTTY.git] / windows / winctrls.c

diff --git a/windows/winctrls.c b/windows/winctrls.c
index 9bee927472d5fb36bd7e1a653682bd6cbe99e6ba..428b6e5565a0e449dadf98c6403dd3f73b8436ad 100644 (file)
--- a/windows/winctrls.c
+++ b/windows/winctrls.c
@@ -372,7 +372,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;
@@ -2406,7 +2405,7 @@ void dlg_beep(void *dlg)
     MessageBeep(0);
 }
 
-void dlg_error_msg(void *dlg, char *msg)
+void dlg_error_msg(void *dlg, const char *msg)
 {
     struct dlgparam *dp = (struct dlgparam *)dlg;
     MessageBox(dp->hwnd, msg,