Choices now allows gadgets to be in any subwindow with some limitations which...

Choices now allows gadgets to be in any subwindow with some limitations which are addressed in the header file.  Also there is no longer a concept of named subwindows.

h/Choices

@@ -28,17 +28,7 @@
 #define CDSet              0x2600
 #define CDCancel           0x2601
 #define CDSaveButton       0x2602
-
-#define CDBrowseDefaults   0x2603
-#define CDWindows          0x2604
-#define CDColours          0x2605
-#define CDFonts            0x2606
-#define CDHotlist          0x2607
-#define CDHistory          0x2608
-#define CDSub6             0x2609
-#define CDSub7             0x260a
-#define CDSub8             0x260b
-
+#define CDFirstSubRadio    0x2603
 #define CDPlaceHolder      0x260f
 
 /* Choices main dialogue and menu event codes */
@@ -68,20 +58,13 @@
 /* Choices subwindows */
 
 #define CDSubNone          -1
-#define CDSubBrowseDefaults 0
-#define CDSubWindows        1
-#define CDSubColours        2
-#define CDSubFonts          3
-#define CDSubHotlist        4
-#define CDSubHistory        5
-#define CDSubSub6           6
-#define CDSubSub7           7
-#define CDSubSub8           8
-
 #define CDNoSubwindows      9
 
 /* Choices Subwindow component ids */
 
+/* In all cases there may only be one of each */
+/* of these components.                       */
+
 /* In BrowseDefaults sub window: */
 
 #define CD_Homepage       0x2650
@@ -101,6 +84,9 @@
 
 /* In colours sub window: */
 
+/* The colour display button MUST have a component id */
+/* one less than it's equivalent menu button.         */
+
 #define CD_BackColour   0x2690
 #define CD_BackColourBt 0x2691
 #define CD_TextColour   0x2692
@@ -113,6 +99,10 @@
 #define CD_FolwColourBt 0x2699
 #define CD_SlctColour   0x269a
 #define CD_SlctColourBt 0x269b
+
+/* The window in which the fake page button resides */
+/* must not be auto redraw.                         */
+
 #define CD_FakePage     0x269c
 
 /* In fonts subwindow */
@@ -121,6 +111,9 @@
 
 /* In hotlist subwindow */
 
+/* The Display fields must have component id one */
+/* less than their equivalent menu buttons.      */
+
 #define CD_HlSaveDisp   0x26d0
 #define CD_HlSaveBt     0x26d1
 #define CD_HlDispDisp   0x26d2