From 2bd2560a60f5f6c4a03bb645bfcf283f8cf47c83 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 30 Jul 2022 14:23:43 +0100
Subject: [PATCH] windows/puttygen.c: move control id enum further up the file.

I'm about to want setupbigedit1 and setupbigedit2 to know the control
ids themselves, and also add more controls to the enum, and it keeps
the diffs more legible if I move the entire enum around unchanged
_first_ and then start making small changes in the middle of it.
---
 windows/puttygen.c | 72 +++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/windows/puttygen.c b/windows/puttygen.c
index ea3557b0..db7c5c87 100644
--- a/windows/puttygen.c
+++ b/windows/puttygen.c
@@ -687,6 +687,42 @@ static void hidemany(HWND hwnd, const int *ids, bool hideit)
     }
 }
 
+enum {
+    controlidstart = 100,
+    IDC_QUIT,
+    IDC_TITLE,
+    IDC_BOX_KEY,
+    IDC_NOKEY,
+    IDC_GENERATING,
+    IDC_PROGRESS,
+    IDC_PKSTATIC, IDC_KEYDISPLAY,
+    IDC_FPSTATIC, IDC_FINGERPRINT,
+    IDC_COMMENTSTATIC, IDC_COMMENTEDIT,
+    IDC_PASSPHRASE1STATIC, IDC_PASSPHRASE1EDIT,
+    IDC_PASSPHRASE2STATIC, IDC_PASSPHRASE2EDIT,
+    IDC_BOX_ACTIONS,
+    IDC_GENSTATIC, IDC_GENERATE,
+    IDC_LOADSTATIC, IDC_LOAD,
+    IDC_SAVESTATIC, IDC_SAVE, IDC_SAVEPUB,
+    IDC_BOX_PARAMS,
+    IDC_TYPESTATIC, IDC_KEYSSH1, IDC_KEYSSH2RSA, IDC_KEYSSH2DSA,
+    IDC_KEYSSH2ECDSA, IDC_KEYSSH2EDDSA,
+    IDC_PRIMEGEN_PROB, IDC_PRIMEGEN_MAURER_SIMPLE, IDC_PRIMEGEN_MAURER_COMPLEX,
+    IDC_RSA_STRONG,
+    IDC_FPTYPE_SHA256, IDC_FPTYPE_MD5,
+    IDC_PPK_PARAMS,
+    IDC_BITSSTATIC, IDC_BITS,
+    IDC_ECCURVESTATIC, IDC_ECCURVE,
+    IDC_EDCURVESTATIC, IDC_EDCURVE,
+    IDC_NOTHINGSTATIC,
+    IDC_ABOUT,
+    IDC_GIVEHELP,
+    IDC_IMPORT,
+    IDC_EXPORT_OPENSSH_AUTO, IDC_EXPORT_OPENSSH_NEW,
+    IDC_EXPORT_SSHCOM,
+    IDC_ADDCERT, IDC_REMCERT,
+};
+
 static void setupbigedit1(HWND hwnd, int id, int idstatic, RSAKey *key)
 {
     char *buffer = ssh1_pubkey_str(key);
@@ -726,42 +762,6 @@ void old_keyfile_warning(void)
     MessageBox(NULL, message, mbtitle, MB_OK);
 }
 
-enum {
-    controlidstart = 100,
-    IDC_QUIT,
-    IDC_TITLE,
-    IDC_BOX_KEY,
-    IDC_NOKEY,
-    IDC_GENERATING,
-    IDC_PROGRESS,
-    IDC_PKSTATIC, IDC_KEYDISPLAY,
-    IDC_FPSTATIC, IDC_FINGERPRINT,
-    IDC_COMMENTSTATIC, IDC_COMMENTEDIT,
-    IDC_PASSPHRASE1STATIC, IDC_PASSPHRASE1EDIT,
-    IDC_PASSPHRASE2STATIC, IDC_PASSPHRASE2EDIT,
-    IDC_BOX_ACTIONS,
-    IDC_GENSTATIC, IDC_GENERATE,
-    IDC_LOADSTATIC, IDC_LOAD,
-    IDC_SAVESTATIC, IDC_SAVE, IDC_SAVEPUB,
-    IDC_BOX_PARAMS,
-    IDC_TYPESTATIC, IDC_KEYSSH1, IDC_KEYSSH2RSA, IDC_KEYSSH2DSA,
-    IDC_KEYSSH2ECDSA, IDC_KEYSSH2EDDSA,
-    IDC_PRIMEGEN_PROB, IDC_PRIMEGEN_MAURER_SIMPLE, IDC_PRIMEGEN_MAURER_COMPLEX,
-    IDC_RSA_STRONG,
-    IDC_FPTYPE_SHA256, IDC_FPTYPE_MD5,
-    IDC_PPK_PARAMS,
-    IDC_BITSSTATIC, IDC_BITS,
-    IDC_ECCURVESTATIC, IDC_ECCURVE,
-    IDC_EDCURVESTATIC, IDC_EDCURVE,
-    IDC_NOTHINGSTATIC,
-    IDC_ABOUT,
-    IDC_GIVEHELP,
-    IDC_IMPORT,
-    IDC_EXPORT_OPENSSH_AUTO, IDC_EXPORT_OPENSSH_NEW,
-    IDC_EXPORT_SSHCOM,
-    IDC_ADDCERT, IDC_REMCERT,
-};
-
 static const int nokey_ids[] = { IDC_NOKEY, 0 };
 static const int generating_ids[] = { IDC_GENERATING, IDC_PROGRESS, 0 };
 static const int gotkey_ids[] = {