Minor improvements to subsidiary window placement; with any luck the

[sgt/putty] / unix / uxcfg.c

diff --git a/unix/uxcfg.c b/unix/uxcfg.c
index 6daa19b..9b13348 100644 (file)
--- a/unix/uxcfg.c
+++ b/unix/uxcfg.c
@@ -10,23 +10,29 @@
 #include "dialog.h"
 #include "storage.h"
 
-void unix_setup_config_box(struct controlbox *b, int midsession)
+static void about_handler(union control *ctrl, void *dlg,
+                         void *data, int event)
+{
+    if (event == EVENT_ACTION) {
+       about_box(ctrl->generic.context.p);
+    }
+}
+
+void unix_setup_config_box(struct controlbox *b, int midsession, void *win)
 {
     struct controlset *s, *s2;
     union control *c;
     int i;
 
-#ifdef FIXME
     if (!midsession) {
        /*
         * Add the About button to the standard panel.
         */
        s = ctrl_getset(b, "", "", "");
        c = ctrl_pushbutton(s, "About", 'a', HELPCTX(no_help),
-                           about_handler, P(hwndp));
+                           about_handler, P(win));
        c->generic.column = 0;
     }
-#endif
 
     /*
      * The Config structure contains two Unix-specific elements
@@ -37,6 +43,14 @@ void unix_setup_config_box(struct controlbox *b, int midsession)
      */
 
     /*
+     * On Unix, we don't have a drop-down list for the printer
+     * control.
+     */
+    s = ctrl_getset(b, "Terminal", "printing", "Remote-controlled printing");
+    assert(s->ncontrols == 1 && s->ctrls[0]->generic.type == CTRL_EDITBOX);
+    s->ctrls[0]->editbox.has_list = 0;
+
+    /*
      * GTK makes it rather easier to put the scrollbar on the left
      * than Windows does!
      */
@@ -89,7 +103,7 @@ void unix_setup_config_box(struct controlbox *b, int midsession)
     ctrl_settitle(b, "Window/Fonts", "Options controlling font usage");
     s = ctrl_getset(b, "Window/Fonts", "font",
                     "Fonts for displaying non-bold text");
-    ctrl_fontsel(s, "Font used for ordinary text", 'w',
+    ctrl_fontsel(s, "Font used for ordinary text", 'f',
                 HELPCTX(no_help),
                 dlg_stdfontsel_handler, I(offsetof(Config,font)));
     ctrl_fontsel(s, "Font used for wide (CJK) text", 'w',