* button.
*/
-#include <windows.h>
-#include <commctrl.h>
#include <assert.h>
#include <ctype.h>
-#include "winstuff.h"
+#include "putty.h"
#include "misc.h"
#include "dialog.h"
-#include "puttymem.h"
-#include "putty.h"
+#include <commctrl.h>
#define GAPBETWEEN 3
#define GAPWITHIN 1
if (!btext)
break;
bid = va_arg(ap, int);
+ nbuttons++;
}
va_end(ap);
buttons = snewn(nbuttons, struct radio);
if (fs.height == 0)
buf = dupprintf("Font: %s, %sdefault height", fs.name, boldstr);
else
- buf = dupprintf("Font: %s, %s%d-point", fs.name, boldstr,
- (fs.height < 0 ? -fs.height : fs.height));
+ buf = dupprintf("Font: %s, %s%d-%s", fs.name, boldstr,
+ (fs.height < 0 ? -fs.height : fs.height),
+ (fs.height < 0 ? "pixel" : "point"));
SetDlgItemText(dp->hwnd, c->base_id+1, buf);
sfree(buf);
}
dp->focused = dp->lastfocused = NULL;
memset(dp->shortcuts, 0, sizeof(dp->shortcuts));
dp->hwnd = NULL;
- dp->errtitle = NULL;
+ dp->wintitle = dp->errtitle = NULL;
dp->privdata = newtree234(perctrl_privdata_cmp);
}
freetree234(dp->privdata);
dp->privdata = NULL;
}
+ sfree(dp->wintitle);
+ sfree(dp->errtitle);
}
void *dlg_get_privdata(union control *ctrl, void *dlg)