X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b5333d89dcaa69c845e4173386d4fc584121b51b..ff89646a8828ce862d53b96a19ee6469dabce71a:/winctrls.c

diff --git a/winctrls.c b/winctrls.c
index 9ed6a544..0e85dbe4 100644
--- a/winctrls.c
+++ b/winctrls.c
@@ -72,17 +72,16 @@ void bartitle(struct ctlpos *cp, char *name, int id) {
 /*
  * Begin a grouping box, with or without a group title.
  */
-void beginbox(struct ctlpos *cp, char *name, int idbox, int idtext) {
-    if (name)
-        cp->ypos += STATICHEIGHT/2;
+void beginbox(struct ctlpos *cp, char *name, int idbox) {
     cp->boxystart = cp->ypos;
+    if (!name)
+        cp->boxystart -= STATICHEIGHT/2;
     if (name)
-        cp->ypos += STATICHEIGHT - (STATICHEIGHT/2);
+        cp->ypos += STATICHEIGHT;
     cp->ypos += GAPYBOX;
     cp->width -= 2*GAPXBOX;
     cp->xoff += GAPXBOX;
     cp->boxid = idbox;
-    cp->boxtextid = idtext;
     cp->boxtext = name;
 }
 
@@ -96,25 +95,8 @@ void endbox(struct ctlpos *cp) {
     cp->ypos += GAPYBOX - GAPBETWEEN;
     r.left = GAPBETWEEN; r.right = cp->width;
     r.top = cp->boxystart; r.bottom = cp->ypos - cp->boxystart;
-    doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ETCHEDFRAME, 0,
-          "", cp->boxid);
-    if (cp->boxtext) {
-        SIZE s;
-        HDC hdc;
-        HFONT oldfont, dlgfont;
-        hdc = GetDC(cp->hwnd);
-        dlgfont = (HFONT)cp->font;
-        oldfont = SelectObject(hdc, dlgfont);
-        GetTextExtentPoint32(hdc, cp->boxtext, strlen(cp->boxtext), &s);
-        SelectObject(hdc, oldfont);
-        DeleteDC(hdc);
-        r.left = GAPXBOX + GAPBETWEEN;
-        r.right = (s.cx * 4 + cp->dlu4inpix-1) / cp->dlu4inpix;
-        
-        r.top = cp->boxystart - STATICHEIGHT/2; r.bottom = STATICHEIGHT;
-        doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE, 0,
-              cp->boxtext, cp->boxtextid);
-    }
+    doctl(cp, r, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 0,
+          cp->boxtext ? cp->boxtext : "", cp->boxid);
     cp->ypos += GAPYBOX;
 }
 
@@ -163,6 +145,13 @@ void multiedit(struct ctlpos *cp, ...) {
  * (you might want this not to equal the number of buttons if you
  * needed to line up some 2s and some 3s to look good in the same
  * panel).
+ * 
+ * There's a bit of a hack in here to ensure that if nacross
+ * exceeds the actual number of buttons, the rightmost button
+ * really does get all the space right to the edge of the line, so
+ * you can do things like
+ * 
+ * (*) Button1  (*) Button2  (*) ButtonWithReallyLongTitle
  */
 void radioline(struct ctlpos *cp,
                char *text, int id, int nacross, ...) {
@@ -170,6 +159,7 @@ void radioline(struct ctlpos *cp,
     va_list ap;
     int group;
     int i;
+    char *btext;
 
     r.left = GAPBETWEEN; r.top = cp->ypos;
     r.right = cp->width; r.bottom = STATICHEIGHT;
@@ -178,15 +168,23 @@ void radioline(struct ctlpos *cp,
     va_start(ap, nacross);
     group = WS_GROUP;
     i = 0;
+    btext = va_arg(ap, char *);
     while (1) {
-        char *btext;
+        char *nextbtext;
         int bid;
-        btext = va_arg(ap, char *);
         if (!btext)
             break;
+	if (i==nacross) {
+	    cp->ypos += r.bottom + GAPBETWEEN;
+	    i=0;
+	}
         bid = va_arg(ap, int);
+        nextbtext = va_arg(ap, char *);
         r.left = GAPBETWEEN + i * (cp->width+GAPBETWEEN)/nacross;
-        r.right = (i+1) * (cp->width+GAPBETWEEN)/nacross - r.left;
+        if (nextbtext)
+            r.right = (i+1) * (cp->width+GAPBETWEEN)/nacross - r.left;
+        else
+            r.right = cp->width - r.left;
         r.top = cp->ypos; r.bottom = RADIOHEIGHT;
         doctl(cp, r, "BUTTON",
               BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | group,
@@ -194,6 +192,7 @@ void radioline(struct ctlpos *cp,
               btext, bid);
         group = 0;
         i++;
+        btext = nextbtext;
     }
     va_end(ap);
     cp->ypos += r.bottom + GAPBETWEEN;