Swap order of `Columns' and `Rows' in the config dialog, to make it

consistent with sizetip.c (and more nebulous conventions).

git-svn-id: svn://svn.tartarus.org/sgt/putty@7196 cda61777-01e9-0310-a592-d414129be87e

diff --git a/config.c b/config.c
index 1e5f8da..d3e59aa 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1399,13 +1399,13 @@ void setup_config_box(struct controlbox *b, int midsession,
 
     s = ctrl_getset(b, "Window", "size", "Set the size of the window");
     ctrl_columns(s, 2, 50, 50);
-    c = ctrl_editbox(s, "Rows", 'r', 100,
-                    HELPCTX(window_size),
-                    dlg_stdeditbox_handler, I(offsetof(Config,height)),I(-1));
-    c->generic.column = 0;
     c = ctrl_editbox(s, "Columns", 'm', 100,
                     HELPCTX(window_size),
                     dlg_stdeditbox_handler, I(offsetof(Config,width)), I(-1));
+    c->generic.column = 0;
+    c = ctrl_editbox(s, "Rows", 'r', 100,
+                    HELPCTX(window_size),
+                    dlg_stdeditbox_handler, I(offsetof(Config,height)),I(-1));
     c->generic.column = 1;
     ctrl_columns(s, 1, 100);
 

diff --git a/doc/config.but b/doc/config.but
index c351a1b..63aac0a 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1003,7 +1003,7 @@ The Window configuration panel allows you to control aspects of the
 
 \cfg{winhelp-topic}{window.size}
 
-The \q{\ii{Rows}} and \q{\ii{Columns}} boxes let you set the PuTTY
+The \q{\ii{Columns}} and \q{\ii{Rows}} boxes let you set the PuTTY
 window to a precise size. Of course you can also \I{window resizing}drag
 the window to a new size while a session is running.