Display panel titles and grouping box titles.

[originally from svn r5291]

diff --git a/mac/macctrls.c b/mac/macctrls.c
index 450b1cd1d6b65a56ee4a6c5aeb41257e06289b85..fe49392d22479ae1e28661b184f41e2c773d6f04 100644 (file)
--- a/mac/macctrls.c
+++ b/mac/macctrls.c
@@ -298,6 +298,22 @@ static void macctrl_layoutset(struct mac_layoutstate *curstate,
     cols[0] = *curstate;
     ncols = 1;
 
+    /* Draw a title, if we have one. */
+    if (!s->boxname && s->boxtitle) {
+       union control c;
+       c.text.label = dupstr(s->boxtitle);
+       macctrl_text(mcs, window, &cols[0], &c);
+       /* FIXME: should be highlighted, centred or boxed */
+    }
+
+    /* Start a containing box, if we have a boxname. */
+    /* FIXME: draw a box, not just its title */
+    if (s->boxname && *s->boxname && s->boxtitle) {
+       union control c;
+       c.text.label = dupstr(s->boxtitle);
+       macctrl_text(mcs, window, &cols[0], &c);
+    }
+
     for (i = 0; i < s->ncontrols; i++) {
        union control *ctrl = s->ctrls[i];