Mention PocketPC in the WinCE question. I'm not sure how similar WinCE and

[u/mdw/putty] / winctrls.c

diff --git a/winctrls.c b/winctrls.c
index 61821c3..df0edce 100644 (file)
--- a/winctrls.c
+++ b/winctrls.c
@@ -153,13 +153,11 @@ 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;
-    va_list ap;
 
     r.left = GAPBETWEEN;
     r.right = cp->width;
@@ -171,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 |
-         CBS_DROPDOWNLIST | CBS_HASSTRINGS, WS_EX_CLIENTEDGE, "", listid);
+         CBS_DROPDOWN | CBS_HASSTRINGS, WS_EX_CLIENTEDGE, "", listid);
 
     cp->ypos += STATICHEIGHT + GAPWITHIN + COMBOHEIGHT + GAPBETWEEN;
 }
@@ -317,14 +315,14 @@ void checkbox(struct ctlpos *cp, char *text, int id)
 /*
  * 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;
-    r.bottom = STATICHEIGHT;
+    r.bottom = STATICHEIGHT * lines;
     cp->ypos += r.bottom + GAPBETWEEN;
     doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0, text, id);
 }
@@ -714,7 +712,7 @@ void charclass(struct ctlpos *cp, char *stext, int sid, int listid,
                        PUSHBTNHEIGHT ? EDITHEIGHT : PUSHBTNHEIGHT);
     const static int percents[] = { 30, 40, 30 };
     int i, xpos, percent;
-    const int LISTHEIGHT = 66;
+    const int LISTHEIGHT = 52;
 
     /* The static control. */
     r.left = GAPBETWEEN;
@@ -995,7 +993,7 @@ int handle_prefslist(struct prefslist *hdl,
 
     if (is_dlmsg) {
 
-        if (wParam == hdl->listid) {
+        if ((int)wParam == hdl->listid) {
             DRAGLISTINFO *dlm = (DRAGLISTINFO *)lParam;
             int dest;
             switch (dlm->uNotification) {
@@ -1026,20 +1024,20 @@ int handle_prefslist(struct prefslist *hdl,
                    SetWindowLong(hwnd, DWL_MSGRESULT, DL_STOPCURSOR);
                 ret = 1; break;
               case DL_DROPPED:
-               ret = 1;
-               if (!hdl->dragging) break;
-               dest = pl_itemfrompt(dlm->hWnd, dlm->ptCursor, TRUE);
-               if (dest > hdl->dummyitem) dest = hdl->dummyitem;
-               DrawInsert (hwnd, dlm->hWnd, -1);
+               if (hdl->dragging) {
+                   dest = pl_itemfrompt(dlm->hWnd, dlm->ptCursor, TRUE);
+                   if (dest > hdl->dummyitem) dest = hdl->dummyitem;
+                   DrawInsert (hwnd, dlm->hWnd, -1);
+               }
                SendDlgItemMessage(hwnd, hdl->listid,
                                   LB_DELETESTRING, hdl->dummyitem, 0);
-               hdl->dragging = 0;
-               if (dest >= 0) {
-                   /* Correct for "missing" item. This means you can't drag
-                    * an item to the end, but that seems to be the way this
-                    * control is used. */
-                   if (dest > hdl->srcitem) dest--;
-                   pl_moveitem(hwnd, hdl->listid, hdl->srcitem, dest);
+               if (hdl->dragging) {
+                   hdl->dragging = 0;
+                   if (dest >= 0) {
+                       /* Correct for "missing" item. */
+                       if (dest > hdl->srcitem) dest--;
+                       pl_moveitem(hwnd, hdl->listid, hdl->srcitem, dest);
+                   }
                }
                 ret = 1; break;
             }