~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't quit the plink main loop until the stdout and stderr buffers
[sgt/putty]
/
winctrls.c
diff --git
a/winctrls.c
b/winctrls.c
index
de4812c
..
eb082f3
100644
(file)
--- a/
winctrls.c
+++ b/
winctrls.c
@@
-153,10
+153,9
@@
void multiedit(struct ctlpos *cp, ...)
}
/*
}
/*
- * A static line, followed by a full-width drop-down list (ie a
- * non-editing combo box).
+ * A static line, followed by a full-width combo box.
*/
*/
-void
dropdownlist
(struct ctlpos *cp, char *text, int staticid, int listid)
+void
combobox
(struct ctlpos *cp, char *text, int staticid, int listid)
{
RECT r;
{
RECT r;
@@
-170,7
+169,7
@@
void dropdownlist(struct ctlpos *cp, char *text, int staticid, int listid)
r.bottom = COMBOHEIGHT * 10;
doctl(cp, r, "COMBOBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
r.bottom = COMBOHEIGHT * 10;
doctl(cp, r, "COMBOBOX",
WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
- CBS_DROPDOWN
LIST
| CBS_HASSTRINGS, WS_EX_CLIENTEDGE, "", listid);
+ CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_CLIENTEDGE, "", listid);
cp->ypos += STATICHEIGHT + GAPWITHIN + COMBOHEIGHT + GAPBETWEEN;
}
cp->ypos += STATICHEIGHT + GAPWITHIN + COMBOHEIGHT + GAPBETWEEN;
}
@@
-316,14
+315,14
@@
void checkbox(struct ctlpos *cp, char *text, int id)
/*
* A single standalone static text control.
*/
/*
* A single standalone static text control.
*/
-void statictext(struct ctlpos *cp, char *text, int id)
+void statictext(struct ctlpos *cp, char *text, int
lines, int
id)
{
RECT r;
r.left = GAPBETWEEN;
r.top = cp->ypos;
r.right = cp->width;
{
RECT r;
r.left = GAPBETWEEN;
r.top = cp->ypos;
r.right = cp->width;
- r.bottom = STATICHEIGHT;
+ r.bottom = STATICHEIGHT
* lines
;
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
}
cp->ypos += r.bottom + GAPBETWEEN;
doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
}