]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2739ea)
Added 'Go' button for quickly saving setup or configure file
authorJulian Smart <julian@anthemion.co.uk>
Tue, 17 Jun 2003 16:23:49 +0000 (16:23 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Tue, 17 Jun 2003 16:23:49 +0000 (16:23 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

15 files changed:
utils/configtool/configs/wxwin250.wxs patch | blob | blame | history
utils/configtool/docs/manual/configtool.tex patch | blob | blame | history
utils/configtool/docs/manual/go.png [new file with mode: 0644] patch | blob
utils/configtool/src/appsettings.cpp patch | blob | blame | history
utils/configtool/src/appsettings.h patch | blob | blame | history
utils/configtool/src/bitmaps/go.xpm [new file with mode: 0644] patch | blob
utils/configtool/src/configitem.cpp patch | blob | blame | history
utils/configtool/src/configtooldoc.cpp patch | blob | blame | history
utils/configtool/src/configtoolview.cpp patch | blob | blame | history
utils/configtool/src/configtoolview.h patch | blob | blame | history
utils/configtool/src/mainframe.cpp patch | blob | blame | history
utils/configtool/src/settingsdialog.cpp patch | blob | blame | history
utils/configtool/src/settingsdialog.h patch | blob | blame | history
utils/configtool/src/wxconfigtool.h patch | blob | blame | history
utils/configtool/src/wxconfigtool.pjd patch | blob | blame | history

diff --git a/utils/configtool/configs/wxwin250.wxs b/utils/configtool/configs/wxwin250.wxs
index 907b9ad6dfc2d40a51f8d54392dee9193662af80..f705fe06be9424a666a0b4d3fae438150ba2634b 100644 (file)
--- a/utils/configtool/configs/wxwin250.wxs
+++ b/utils/configtool/configs/wxwin250.wxs
@@ -10,6 +10,7 @@
         <precludes></precludes>
         <enabled-if></enabled-if>
         <enabled-if-not></enabled-if-not>
         <precludes></precludes>
         <enabled-if></enabled-if>
         <enabled-if-not></enabled-if-not>
+        <indeterminate-if></indeterminate-if>
         <exclusivity></exclusivity>
         <context></context>
         <configure-command></configure-command>
         <exclusivity></exclusivity>
         <context></context>
         <configure-command></configure-command>
@@ -27,6 +28,7 @@ There may be several targets per platform; for example on MS Windows, you can ch
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -45,6 +47,7 @@ This port is for Windows 9x, ME, NT, 2K, XP, using the native widgets.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>MGL,X11,Mac Carbon,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-msw</configure-command>
                 <exclusivity>MGL,X11,Mac Carbon,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-msw</configure-command>
@@ -53,7 +56,7 @@ This port is for Windows 9x, ME, NT, 2K, XP, using the native widgets.
             </setting>
             <setting type="bool-radio">
                 <active>1</active>
             </setting>
             <setting type="bool-radio">
                 <active>1</active>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <name>Windows/Universal</name>
                 <description>&lt;b&gt;Windows/Universal&lt;/b&gt;&lt;P&gt;
 
                 <name>Windows/Universal</name>
                 <description>&lt;b&gt;Windows/Universal&lt;/b&gt;&lt;P&gt;
 
@@ -63,6 +66,7 @@ A port for MS Windows, using the wxUniversal widget set.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>GTK+ 1.x,GTK+ 2.x,Mac Carbon,Mac Cocoa,MGL,Motif,OS/2,Windows,Wine,X11</exclusivity>
                 <context></context>
                 <configure-command>--with-msw</configure-command>
                 <exclusivity>GTK+ 1.x,GTK+ 2.x,Mac Carbon,Mac Cocoa,MGL,Motif,OS/2,Windows,Wine,X11</exclusivity>
                 <context></context>
                 <configure-command>--with-msw</configure-command>
@@ -82,6 +86,7 @@ This port is based on the wxUniversal widgets.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>MGL,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-x11</configure-command>
                 <exclusivity>MGL,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-x11</configure-command>
@@ -101,6 +106,7 @@ A port for Mac OS 9 and Mac OS 10.x.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>MGL,X11,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-mac</configure-command>
                 <exclusivity>MGL,X11,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-mac</configure-command>
@@ -119,6 +125,7 @@ This port uses the Cocoa API on Mac OS X.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>GTK+ 2.x,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-cocoa</configure-command>
                 <exclusivity>GTK+ 2.x,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-cocoa</configure-command>
@@ -138,6 +145,7 @@ This port is based on the GTK+ 1.x and 2.x widget set.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>MGL,X11,Mac Carbon,Windows,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-gtk</configure-command>
                 <exclusivity>MGL,X11,Mac Carbon,Windows,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-gtk</configure-command>
@@ -156,6 +164,7 @@ This port uses GTK+ 2.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>Mac Cocoa,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-gtk2</configure-command>
                 <exclusivity>Mac Cocoa,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-gtk2</configure-command>
@@ -175,6 +184,7 @@ This port uses Motif 1.x/2.x or Lesstif.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>MGL,X11,Mac Carbon,Windows,GTK+ 1.x,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-motif</configure-command>
                 <exclusivity>MGL,X11,Mac Carbon,Windows,GTK+ 1.x,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-motif</configure-command>
@@ -193,6 +203,7 @@ This port uses OS/2 Presentation Manager.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,X11,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-pm</configure-command>
                 <exclusivity>GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,X11,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-pm</configure-command>
@@ -201,7 +212,7 @@ This port uses OS/2 Presentation Manager.</description>
             </setting>
             <setting type="bool-radio">
                 <active>1</active>
             </setting>
             <setting type="bool-radio">
                 <active>1</active>
-                <enabled>0</enabled>
+                <enabled>1</enabled>
                 <name>Wine</name>
                 <description>&lt;B&gt;Wine port&lt;/B&gt;&lt;P&gt;
 
                 <name>Wine</name>
                 <description>&lt;B&gt;Wine port&lt;/B&gt;&lt;P&gt;
 
@@ -211,6 +222,7 @@ The wxMSW port built for Wine (Windows emulation library).</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>Mac Cocoa,GTK+ 1.x,GTK+ 2.x,Mac Carbon,MGL,Motif,Windows,OS/2,X11,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-wine</configure-command>
                 <exclusivity>Mac Cocoa,GTK+ 1.x,GTK+ 2.x,Mac Carbon,MGL,Motif,Windows,OS/2,X11,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-wine</configure-command>
@@ -229,237 +241,429 @@ This port is based on the wxUniversal widgets.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity>X11,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,Wine,GTK+ 2.x,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-mgl</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <exclusivity>X11,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,Wine,GTK+ 2.x,Windows/Universal</exclusivity>
                 <context></context>
                 <configure-command>--with-mgl</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
+            <setting type="group">
+                <active>1</active>
+                <enabled>0</enabled>
+                <name>Target symbols</name>
+                <description>&lt;B&gt;Build options&lt;/B&gt;&lt;P&gt;
+
+Major build options.</description>
+                <default-state>1</default-state>
+                <requires></requires>
+                <precludes></precludes>
+                <enabled-if></enabled-if>
+                <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity></exclusivity>
+                <context></context>
+                <configure-command></configure-command>
+                <help-topic></help-topic>
+                <notes></notes>
+                <setting type="bool-check">
+                    <active>1</active>
+                    <enabled>1</enabled>
+                    <name>wxUSE_GUI</name>
+                    <description>&lt;B&gt;Use GUI&lt;/B&gt;&lt;P&gt;
+
+If on, builds a GUI version of the library as opposed to wxBase. Currently, this needs to be enabled.</description>
+                    <default-state>1</default-state>
+                    <requires></requires>
+                    <precludes></precludes>
+                    <enabled-if></enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command>--enable-gui</configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>1</enabled>
+                    <name>__WXMSW__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.</description>
+                    <default-state>1</default-state>
+                    <requires>Windows,Wine,Windows/Universal</requires>
+                    <precludes></precludes>
+                    <enabled-if>Windows,Wine,Windows/Universal</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXGTK__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>GTK+ 1.x,GTK+ 2.x</requires>
+                    <precludes></precludes>
+                    <enabled-if>GTK+ 1.x,GTK+ 2.x</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXGTK20__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>GTK+ 2.x</requires>
+                    <precludes></precludes>
+                    <enabled-if>GTK+ 2.x</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXX11__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>X11</requires>
+                    <precludes></precludes>
+                    <enabled-if>X11</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXMOTIF__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>Motif</requires>
+                    <precludes></precludes>
+                    <enabled-if>Motif</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXMAC__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>Mac Carbon</requires>
+                    <precludes></precludes>
+                    <enabled-if>Mac Carbon</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXCOCOA__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>Mac Cocoa</requires>
+                    <precludes></precludes>
+                    <enabled-if>Mac Cocoa</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXPM__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>OS/2</requires>
+                    <precludes></precludes>
+                    <enabled-if>OS/2</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXMGL__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>MGL</requires>
+                    <precludes></precludes>
+                    <enabled-if>MGL</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>__WXUNIVERSAL__</name>
+                    <description>This is enabled if the relevant platform settings are enabled.
+</description>
+                    <default-state>1</default-state>
+                    <requires>X11,MGL,Windows/Universal</requires>
+                    <precludes></precludes>
+                    <enabled-if>X11,MGL,Windows/Universal</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command></configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+                <setting type="bool-check">
+                    <active>0</active>
+                    <enabled>0</enabled>
+                    <name>wxUSE_UNIVERSAL</name>
+                    <description>&lt;B&gt;Universal&lt;/B&gt;&lt;P&gt;
+
+Specifies if wxUniversal should be used instead of native widgets.&lt;P&gt;
+
+If the selected port in &lt;B&gt;Platform&lt;/B&gt; is a wxUniversal port, this setting is enabled and is not user-editable. Otherwise, it can be enabled or disabled. However this doesn't necessarily mean that the configuration is supported for any given platform.</description>
+                    <default-state>0</default-state>
+                    <requires>__WXUNIVERSAL__</requires>
+                    <precludes></precludes>
+                    <enabled-if>__WXUNIVERSAL__</enabled-if>
+                    <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
+                    <exclusivity></exclusivity>
+                    <context></context>
+                    <configure-command>--enable-universal</configure-command>
+                    <help-topic></help-topic>
+                    <notes></notes>
+                </setting>
+            </setting>
         </setting>
         <setting type="group">
             <active>1</active>
             <enabled>0</enabled>
         </setting>
         <setting type="group">
             <active>1</active>
             <enabled>0</enabled>
-            <name>Build options</name>
-            <description>&lt;B&gt;Build options&lt;/B&gt;&lt;P&gt;
+            <name>Build configuration</name>
+            <description>&lt;B&gt;Build configuration&lt;/B&gt;&lt;P&gt;
 
 
-Major build options.</description>
+Select a high-level build configuration. This will change other settings. This is a way of selecting a configuration that is compatible both with configure and makefiles.</description>
             <default-state>1</default-state>
             <requires></requires>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <default-state>1</default-state>
             <requires></requires>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <help-topic></help-topic>
             <notes></notes>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <help-topic></help-topic>
             <notes></notes>
-            <setting type="bool-check">
+            <setting type="bool-radio">
                 <active>1</active>
                 <enabled>1</enabled>
                 <active>1</active>
                 <enabled>1</enabled>
-                <name>wxUSE_GUI</name>
-                <description>&lt;B&gt;Use GUI&lt;/B&gt;&lt;P&gt;
-
-If on, builds a GUI version of the library as opposed to wxBase. Currently, this needs to be enabled.</description>
+                <name>Debug ANSI Static</name>
+                <description>&lt;B&gt;Debug ANSI Static&lt;/B&gt;&lt;P&gt;
+</description>
                 <default-state>1</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <default-state>1</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
-                <context></context>
-                <configure-command>--enable-gui</configure-command>
-                <help-topic></help-topic>
-                <notes></notes>
-            </setting>
-            <setting type="bool-check">
-                <active>0</active>
-                <enabled>1</enabled>
-                <name>__WXMSW__</name>
-                <description>This is enabled if the relevant platform settings are enabled.</description>
-                <default-state>1</default-state>
-                <requires>Windows,Wine,Windows/Universal</requires>
-                <precludes></precludes>
-                <enabled-if>Windows,Wine,Windows/Universal</enabled-if>
-                <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Release ANSI Static,Debug Unicode Static,Release Unicode Static,Debug ANSI Shared,Release ANSI Shared,Debug Unicode Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXGTK__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
+                <name>Release ANSI Static</name>
+                <description>&lt;B&gt;Debug ANSI Static&lt;/B&gt;&lt;P&gt;
 </description>
                 <default-state>1</default-state>
 </description>
                 <default-state>1</default-state>
-                <requires>GTK+ 1.x,GTK+ 2.x</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>GTK+ 1.x,GTK+ 2.x</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Debug Unicode Static,Release Unicode Static,Debug ANSI Shared,Release ANSI Shared,Debug Unicode Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXGTK20__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
+                <name>Debug Unicode Static</name>
+                <description>&lt;B&gt;Debug ANSI Static&lt;/B&gt;&lt;P&gt;
 </description>
                 <default-state>1</default-state>
 </description>
                 <default-state>1</default-state>
-                <requires>GTK+ 2.x</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>GTK+ 2.x</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Release Unicode Static,Debug ANSI Shared,Release ANSI Shared,Debug Unicode Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXX11__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
+                <name>Release Unicode Static</name>
+                <description>&lt;B&gt;Debug ANSI Static&lt;/B&gt;&lt;P&gt;
 </description>
                 <default-state>1</default-state>
 </description>
                 <default-state>1</default-state>
-                <requires>X11</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>X11</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Debug Unicode Static,Debug ANSI Shared,Release ANSI Shared,Debug Unicode Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXMOTIF__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
+                <name>Debug ANSI Shared</name>
+                <description>&lt;B&gt;Debug ANSI Static&lt;/B&gt;&lt;P&gt;
 </description>
                 <default-state>1</default-state>
 </description>
                 <default-state>1</default-state>
-                <requires>Motif</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>Motif</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Debug Unicode Static,Release Unicode Static,Release ANSI Shared,Debug Unicode Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXMAC__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
+                <name>Release ANSI Shared</name>
+                <description>&lt;B&gt;Debug ANSI Static&lt;/B&gt;&lt;P&gt;
 </description>
                 <default-state>1</default-state>
 </description>
                 <default-state>1</default-state>
-                <requires>Mac Carbon</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>Mac Carbon</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Debug Unicode Static,Release Unicode Static,Debug ANSI Shared,Debug Unicode Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXCOCOA__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
-</description>
+                <name>Debug Unicode Shared</name>
+                <description></description>
                 <default-state>1</default-state>
                 <default-state>1</default-state>
-                <requires>Mac Cocoa</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>Mac Cocoa</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Debug Unicode Static,Release Unicode Static,Debug ANSI Shared,Release ANSI Shared,Release Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXPM__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
-</description>
+                <name>Release Unicode Shared</name>
+                <description></description>
                 <default-state>1</default-state>
                 <default-state>1</default-state>
-                <requires>OS/2</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>OS/2</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Debug Unicode Static,Release Unicode Static,Debug ANSI Shared,Release ANSI Shared,Debug Unicode Shared,Custom</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
+            <setting type="bool-radio">
+                <active>1</active>
                 <enabled>0</enabled>
                 <enabled>0</enabled>
-                <name>__WXMGL__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
-</description>
-                <default-state>1</default-state>
-                <requires>MGL</requires>
-                <precludes></precludes>
-                <enabled-if>MGL</enabled-if>
-                <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
-                <context></context>
-                <configure-command></configure-command>
-                <help-topic></help-topic>
-                <notes></notes>
-            </setting>
-            <setting type="bool-check">
-                <active>0</active>
-                <enabled>1</enabled>
-                <name>__WXUNIVERSAL__</name>
-                <description>This is enabled if the relevant platform settings are enabled.
-</description>
+                <name>Custom</name>
+                <description></description>
                 <default-state>1</default-state>
                 <default-state>1</default-state>
-                <requires>X11,MGL,Windows/Universal</requires>
+                <requires></requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if>X11,MGL,Windows/Universal</enabled-if>
+                <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
+                <indeterminate-if></indeterminate-if>
+                <exclusivity>Debug ANSI Static,Release ANSI Static,Debug Unicode Static,Release Unicode Static,Debug ANSI Shared,Release ANSI Shared,Debug Unicode Shared,Release Unicode Shared</exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <context></context>
                 <configure-command></configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
-            <setting type="bool-check">
-                <active>0</active>
-                <enabled>1</enabled>
-                <name>wxUSE_UNIVERSAL</name>
-                <description>&lt;B&gt;Universal&lt;/B&gt;&lt;P&gt;
-
-Specifies if wxUniversal should be used instead of native widgets.&lt;P&gt;
-
-If the selected port in &lt;B&gt;Platform&lt;/B&gt; is a wxUniversal port, this setting is enabled and is not user-editable. Otherwise, it can be enabled or disabled. However this doesn't necessarily mean that the configuration is supported for any given platform.</description>
-                <default-state>0</default-state>
-                <requires>__WXUNIVERSAL__</requires>
-                <precludes></precludes>
-                <enabled-if>__WXUNIVERSAL__</enabled-if>
-                <enabled-if-not></enabled-if-not>
-                <exclusivity></exclusivity>
-                <context></context>
-                <configure-command>--enable-universal</configure-command>
-                <help-topic></help-topic>
-                <notes></notes>
-            </setting>
         </setting>
         <setting type="group">
             <active>1</active>
         </setting>
         <setting type="group">
             <active>1</active>
@@ -473,6 +677,7 @@ A variety of options, mostly specific to Unix compilers.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -487,11 +692,12 @@ A variety of options, mostly specific to Unix compilers.</description>
 Use the dmalloc library.&lt;P&gt;
 
 See: http://dmalloc.com.</description>
 Use the dmalloc library.&lt;P&gt;
 
 See: http://dmalloc.com.</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-dmalloc</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-dmalloc</configure-command>
@@ -499,20 +705,21 @@ See: http://dmalloc.com.</description>
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <notes></notes>
             </setting>
             <setting type="bool-check">
-                <active>1</active>
+                <active>0</active>
                 <enabled>0</enabled>
                 <name>wxUSE_SHARED</name>
                 <description>&lt;B&gt;Shared library&lt;/B&gt;&lt;P&gt;
 
 Use a shared library.</description>
                 <default-state>1</default-state>
                 <enabled>0</enabled>
                 <name>wxUSE_SHARED</name>
                 <description>&lt;B&gt;Shared library&lt;/B&gt;&lt;P&gt;
 
 Use a shared library.</description>
                 <default-state>1</default-state>
-                <requires></requires>
+                <requires>Debug Unicode Shared,Debug ANSI Shared,Release Unicode Shared,Release ANSI Shared</requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if></enabled-if>
+                <enabled-if>Debug Unicode Shared,Debug ANSI Shared,Release Unicode Shared,Release ANSI Shared</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if>Custom</indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-shared</configure-command>
+                <configure-command>--enable-shared</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -528,24 +735,26 @@ Set the DT_SONAME field in ELF shared libraries</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-soname</configure-command>
+                <configure-command>--enable-soname</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
             <setting type="bool-check">
-                <active>1</active>
+                <active>0</active>
                 <enabled>0</enabled>
                 <name>wxUSE_OPTIMISE</name>
                 <description>&lt;B&gt;Optimise&lt;/B&gt;&lt;P&gt;
 
 Create optimised code.</description>
                 <default-state>1</default-state>
                 <enabled>0</enabled>
                 <name>wxUSE_OPTIMISE</name>
                 <description>&lt;B&gt;Optimise&lt;/B&gt;&lt;P&gt;
 
 Create optimised code.</description>
                 <default-state>1</default-state>
-                <requires></requires>
+                <requires>Release ANSI Static,Release Unicode Static,Release Unicode Shared</requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if></enabled-if>
+                <enabled-if>Release ANSI Static,Release Unicode Static,Release Unicode Shared</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if>Custom</indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-optimise</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-optimise</configure-command>
@@ -553,38 +762,40 @@ Create optimised code.</description>
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <notes></notes>
             </setting>
             <setting type="bool-check">
-                <active>1</active>
-                <enabled>0</enabled>
+                <active>0</active>
+                <enabled>1</enabled>
                 <name>wxUSE_DEBUG</name>
                 <description>&lt;B&gt;Use debugging information&lt;/B&gt;&lt;P&gt;
 
 Same as wxUSE_DEBUG_FLAG (set __WXDEBUG__ flag) and wxUSE_DEBUG_INFO (create code with debugging information).</description>
                 <default-state>1</default-state>
                 <name>wxUSE_DEBUG</name>
                 <description>&lt;B&gt;Use debugging information&lt;/B&gt;&lt;P&gt;
 
 Same as wxUSE_DEBUG_FLAG (set __WXDEBUG__ flag) and wxUSE_DEBUG_INFO (create code with debugging information).</description>
                 <default-state>1</default-state>
-                <requires></requires>
+                <requires>Debug ANSI Static,Debug Unicode Static,Debug ANSI Shared,Debug Unicode Shared</requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if></enabled-if>
+                <enabled-if>Debug ANSI Static,Debug Unicode Static,Debug ANSI Shared,Debug Unicode Shared</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if>Custom</indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-debug</configure-command>
+                <configure-command>--enable-debug</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
             <setting type="bool-check">
-                <active>1</active>
-                <enabled>0</enabled>
+                <active>0</active>
+                <enabled>1</enabled>
                 <name>wxUSE_DEBUG_GDB</name>
                 <description>&lt;B&gt;GDB debugging information&lt;/B&gt;&lt;P&gt;
 
 Create code with extra GDB debugging information.</description>
                 <default-state>1</default-state>
                 <name>wxUSE_DEBUG_GDB</name>
                 <description>&lt;B&gt;GDB debugging information&lt;/B&gt;&lt;P&gt;
 
 Create code with extra GDB debugging information.</description>
                 <default-state>1</default-state>
-                <requires></requires>
+                <requires>wxUSE_DEBUG</requires>
                 <precludes></precludes>
                 <precludes></precludes>
-                <enabled-if></enabled-if>
+                <enabled-if>wxUSE_DEBUG</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if>Custom</indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-debug_gdb</configure-command>
+                <configure-command>--enable-debug_gdb</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -595,14 +806,15 @@ Create code with extra GDB debugging information.</description>
                 <description>&lt;B&gt;Profiling information&lt;/B&gt;&lt;P&gt;
 
 Create code with profiling information.</description>
                 <description>&lt;B&gt;Profiling information&lt;/B&gt;&lt;P&gt;
 
 Create code with profiling information.</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-profile</configure-command>
+                <configure-command>--enable-profile</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -618,9 +830,10 @@ Create code without RTTI (Run-time type) information.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-no_rtti</configure-command>
+                <configure-command>--enable-no_rtti</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -631,14 +844,15 @@ Create code without RTTI (Run-time type) information.</description>
                 <description>&lt;B&gt;No exception handling&lt;/B&gt;&lt;P&gt;
 
 Create code without C++ exceptions handling.</description>
                 <description>&lt;B&gt;No exception handling&lt;/B&gt;&lt;P&gt;
 
 Create code without C++ exceptions handling.</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-no_exceptions</configure-command>
+                <configure-command>--enable-no_exceptions</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -646,15 +860,16 @@ Create code without C++ exceptions handling.</description>
                 <active>1</active>
                 <enabled>0</enabled>
                 <name>wxUSE_PERMISSIVE</name>
                 <active>1</active>
                 <enabled>0</enabled>
                 <name>wxUSE_PERMISSIVE</name>
-                <description></description>
-                <default-state>1</default-state>
+                <description>&lt;b&gt;Permissive&lt;/b&gt;&lt;P&gt;</description>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-permissive</configure-command>
+                <configure-command>--enable-permissive</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -665,14 +880,15 @@ Create code without C++ exceptions handling.</description>
                 <description>&lt;B&gt;No dependency information&lt;/B&gt;&lt;P&gt;
 
 Create code without dependency information.</description>
                 <description>&lt;B&gt;No dependency information&lt;/B&gt;&lt;P&gt;
 
 Create code without dependency information.</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <exclusivity></exclusivity>
                 <context></context>
-                <configure-command>--with-no_deps</configure-command>
+                <configure-command>--enable-no_deps</configure-command>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
@@ -685,11 +901,12 @@ Create code without dependency information.</description>
 Output the rpath flag from wx-config.&lt;P&gt;
 
 If you enable this setting, please enter the path into the &lt;b&gt;value&lt;/b&gt; property.</description>
 Output the rpath flag from wx-config.&lt;P&gt;
 
 If you enable this setting, please enter the path into the &lt;b&gt;value&lt;/b&gt; property.</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-rpath</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-rpath</configure-command>
@@ -702,15 +919,16 @@ Enter the RPATH directory here."></value>
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>0</enabled>
             <setting type="bool-check">
                 <active>1</active>
                 <enabled>0</enabled>
-                <name>wxUSE_WXPRINTFV</name>
+                <name>wxUSE_EXPERIMENTAL_PRINTF</name>
                 <description>&lt;B&gt;Use wxWindows implementation of wxPrintfv&lt;/B&gt;&lt;P&gt;
 
 Check to use the wxWindows implementation.</description>
                 <description>&lt;B&gt;Use wxWindows implementation of wxPrintfv&lt;/B&gt;&lt;P&gt;
 
 Check to use the wxWindows implementation.</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-wxprintfv</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-wxprintfv</configure-command>
@@ -728,6 +946,7 @@ Check to use the wxWindows implementation.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -749,6 +968,7 @@ Default is 0. Recommended setting: 0 (in fact the compatibility code is now very
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -770,6 +990,7 @@ Recommended setting: 0 (please update your code instead!)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-compat20</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-compat20</configure-command>
@@ -791,6 +1012,7 @@ The default is 0. Recommended setting: 0 (please update your code)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-compat22</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-compat22</configure-command>
@@ -815,6 +1037,7 @@ Recommended setting: 0 (please update your code)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-compat24</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-compat24</configure-command>
@@ -836,6 +1059,7 @@ Default is 0.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command></configure-command>
@@ -857,6 +1081,7 @@ Default is 1. Recommended setting: 0 (the new calculations are more correct!)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command></configure-command>
@@ -885,6 +1110,7 @@ and if __NO_VC_CRTDBG__ is not defined.
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -905,6 +1131,7 @@ Default is 0. Recommended setting: 0&lt;P&gt;
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-debug_cntxt</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-debug_cntxt</configure-command>
@@ -926,6 +1153,7 @@ Default is 0. Recommended setting: 1 if you are not using a memory debugging too
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-mem_tracing</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-mem_tracing</configure-command>
@@ -950,6 +1178,7 @@ Default: 0. Recommended setting: 0
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -971,6 +1200,7 @@ Default: 0. Recommended setting: 0
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -994,6 +1224,7 @@ Default: 1. Recommended setting: 1 if your compiler supports it.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command>--enable-catch_segvs</configure-command>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command>--enable-catch_segvs</configure-command>
@@ -1011,13 +1242,14 @@ Default: 1. Recommended setting: 1 if your compiler supports it.
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <help-topic></help-topic>
             <notes></notes>
             <setting type="bool-check">
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <help-topic></help-topic>
             <notes></notes>
             <setting type="bool-check">
-                <active>1</active>
+                <active>0</active>
                 <enabled>0</enabled>
                 <name>wxUSE_UNICODE</name>
                 <description>&lt;B&gt;Unicode mode&lt;/B&gt;&lt;P&gt;
                 <enabled>0</enabled>
                 <name>wxUSE_UNICODE</name>
                 <description>&lt;B&gt;Unicode mode&lt;/B&gt;&lt;P&gt;
@@ -1028,11 +1260,12 @@ Unicode is currently only fully supported under Windows NT/2000/XP (Windows 9x d
 
 Default: 0. Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
 </description>
 
 Default: 0. Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
 </description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <requires></requires>
-                <precludes></precludes>
-                <enabled-if></enabled-if>
+                <precludes>Debug ANSI Static,Release ANSI Static,Debug ANSI Shared,Release ANSI Shared</precludes>
+                <enabled-if>Debug Unicode Static,Release Unicode Static,Debug Unicode Shared,Release Unicode Shared</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if>Custom</indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-unicode</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-unicode</configure-command>
@@ -1064,6 +1297,7 @@ Default: 0. Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x s
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command>--enable-mslu</configure-command>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command>--enable-mslu</configure-command>
@@ -1087,6 +1321,7 @@ Default: 1. Recommended setting: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -1106,6 +1341,7 @@ Default: 1. Recommended setting: 1
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -1126,6 +1362,7 @@ Default: 1. Recommended setting: 1 (always)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-log</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-log</configure-command>
@@ -1143,6 +1380,7 @@ Default: 1. Recommended setting: 1 (always)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-logwin</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-logwin</configure-command>
@@ -1159,6 +1397,7 @@ Default: 1. Recommended setting: 1 (always)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-loggui</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-loggui</configure-command>
@@ -1175,6 +1414,7 @@ Default: 1. Recommended setting: 1 (always)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-logdialog</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-logdialog</configure-command>
@@ -1192,6 +1432,7 @@ Default: 1. Recommended setting: 1 (always)
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -1213,6 +1454,7 @@ Default: 1. Recommended setting: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-streams</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-streams</configure-command>
@@ -1230,6 +1472,7 @@ Default: 1</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-zipstream</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-zipstream</configure-command>
@@ -1252,6 +1495,7 @@ Default: 0
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-std_iostreams</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-std_iostreams</configure-command>
@@ -1273,6 +1517,7 @@ Default: 1. Recommended setting: 1. wxFile is highly recommended as it is requir
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-file</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-file</configure-command>
@@ -1293,6 +1538,7 @@ Default: 1. Recommended setting: 1.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-ffile</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-ffile</configure-command>
@@ -1314,6 +1560,7 @@ Default: 1. Recommended setting: 1 (but may be safely disabled if you don't use
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -1332,6 +1579,7 @@ This class is required by wxTextFile.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-textbuf</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-textbuf</configure-command>
@@ -1350,6 +1598,7 @@ Requires wxFile and wxTextBuffer, required by wxFileConfig.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-textfile</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-textfile</configure-command>
@@ -1370,6 +1619,7 @@ Default: 1.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-config</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-config</configure-command>
@@ -1394,6 +1644,7 @@ Default: 1. Recommended setting: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -1412,6 +1663,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-mimetype</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-mimetype</configure-command>
@@ -1430,6 +1682,7 @@ Enable virtual file systems (required by wxHTML)</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-filesystem</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-filesystem</configure-command>
@@ -1450,6 +1703,7 @@ Default: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-fs_zip</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-fs_zip</configure-command>
@@ -1468,6 +1722,7 @@ Default: 1</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-fs_inet</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-fs_inet</configure-command>
@@ -1493,6 +1748,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-xresources</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-xresources</configure-command>
@@ -1516,6 +1772,7 @@ Recommended setting: whatever your compiler likes more
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -1534,6 +1791,7 @@ Clear to disable large file support (-D_LARGE_FILES).</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-largefile</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-largefile</configure-command>
@@ -1551,6 +1809,7 @@ Clear to disable large file support (-D_LARGE_FILES).</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -1573,6 +1832,7 @@ Default: 1. Recommended setting: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-longlong</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-longlong</configure-command>
@@ -1594,6 +1854,7 @@ Default: 1. Recommended setting: 1 unless you don't like the licence terms (unli
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-apple_ieee</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-apple_ieee</configure-command>
@@ -1614,6 +1875,7 @@ Default: 1 Recommended setting: 1 if your compiler supports it.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-regex</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-regex</configure-command>
@@ -1634,6 +1896,7 @@ Check to use the built-in version of the library, clear to use the wxWindows ver
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-geometry</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-geometry</configure-command>
@@ -1651,6 +1914,7 @@ Check to use the built-in version of the library, clear to use the wxWindows ver
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -1674,6 +1938,7 @@ Requires: wxUSE_LONGLONG. Default: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-datetime</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-datetime</configure-command>
@@ -1692,6 +1957,7 @@ Default: 1.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-timer</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-timer</configure-command>
@@ -1710,6 +1976,7 @@ Default: 1. Needed by wxSocket.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-stopwatch</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-stopwatch</configure-command>
@@ -1727,6 +1994,7 @@ Default: 1. Needed by wxSocket.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -1747,6 +2015,7 @@ Default: 1. Recommended setting: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dialupman</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dialupman</configure-command>
@@ -1767,6 +2036,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-sockets</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-sockets</configure-command>
@@ -1789,6 +2059,7 @@ Default: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-protocol</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-protocol</configure-command>
@@ -1806,6 +2077,7 @@ Default: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-protocol-file</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-protocol-file</configure-command>
@@ -1822,6 +2094,7 @@ Default: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-protocol-ftp</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-protocol-ftp</configure-command>
@@ -1838,6 +2111,7 @@ Default: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-protocol-http</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-protocol-http</configure-command>
@@ -1854,6 +2128,7 @@ Default: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-url</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-url</configure-command>
@@ -1875,6 +2150,7 @@ Default: 1. Recommended value: 1.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-ipc</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-ipc</configure-command>
@@ -1892,6 +2168,7 @@ Default: 1. Recommended value: 1.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -1909,6 +2186,7 @@ On MS Windows, depending on the value of wxUSE_NATIVE_STATUSBAR, either wxStatus
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-statusbar</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-statusbar</configure-command>
@@ -1927,6 +2205,7 @@ Default: 1. Recommended setting: 1 (there is no advantage in using the generic o
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
@@ -1950,6 +2229,7 @@ Default: 1. Recommended setting: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-toolbar</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-toolbar</configure-command>
@@ -1965,6 +2245,7 @@ Default: 1. Recommended setting: 1</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-tbarnative</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-tbarnative</configure-command>
@@ -1983,6 +2264,7 @@ This must be enabled if wxUSE_TOOLBAR_NATIVE is disabled.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not>wxUSE_TOOLBAR_NATIVE</enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not>wxUSE_TOOLBAR_NATIVE</enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-tbarsmpl</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-tbarsmpl</configure-command>
@@ -2002,6 +2284,7 @@ wxGrid class.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-grid</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-grid</configure-command>
@@ -2018,6 +2301,7 @@ wxGrid class.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-sash</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-sash</configure-command>
@@ -2034,6 +2318,7 @@ wxGrid class.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-splitter</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-splitter</configure-command>
@@ -2050,6 +2335,7 @@ wxGrid class.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-opengl</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-opengl</configure-command>
@@ -2069,6 +2355,7 @@ Enables the popup window class.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-popupwin</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-popupwin</configure-command>
@@ -2089,6 +2376,7 @@ This is used to implement tooltips on some ports.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-tipwindow</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-tipwindow</configure-command>
@@ -2107,6 +2395,7 @@ Use the wxMiniFrame class. Not implemented on all platforms.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-miniframe</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-miniframe</configure-command>
@@ -2126,6 +2415,7 @@ Use the wxMiniFrame class. Not implemented on all platforms.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-controls</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-controls</configure-command>
@@ -2141,6 +2431,7 @@ Use the wxMiniFrame class. Not implemented on all platforms.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-button</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-button</configure-command>
@@ -2157,6 +2448,7 @@ Use the wxMiniFrame class. Not implemented on all platforms.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-bmpbutton</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-bmpbutton</configure-command>
@@ -2175,6 +2467,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-calendar</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-calendar</configure-command>
@@ -2191,6 +2484,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-checkbox</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-checkbox</configure-command>
@@ -2207,6 +2501,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-checklst</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-checklst</configure-command>
@@ -2224,6 +2519,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-choice</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-choice</configure-command>
@@ -2240,6 +2536,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-combobox</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-combobox</configure-command>
@@ -2256,6 +2553,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-gauge</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-gauge</configure-command>
@@ -2272,6 +2570,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-listbox</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-listbox</configure-command>
@@ -2288,6 +2587,7 @@ A calendar control.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-listctrl</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-listctrl</configure-command>
@@ -2309,6 +2609,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-notebook</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-notebook</configure-command>
@@ -2325,6 +2626,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-radiobox</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-radiobox</configure-command>
@@ -2341,6 +2643,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-radiobtn</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-radiobtn</configure-command>
@@ -2357,6 +2660,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-scrollbar</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-scrollbar</configure-command>
@@ -2373,6 +2677,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-slider</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-slider</configure-command>
@@ -2389,6 +2694,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-spinbtn</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-spinbtn</configure-command>
@@ -2405,6 +2711,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-spinctrl</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-spinctrl</configure-command>
@@ -2421,6 +2728,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-statbox</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-statbox</configure-command>
@@ -2437,6 +2745,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-statline</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-statline</configure-command>
@@ -2453,6 +2762,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-stattext</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-stattext</configure-command>
@@ -2469,6 +2779,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-staticbmp</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-staticbmp</configure-command>
@@ -2485,6 +2796,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-textctrl</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-textctrl</configure-command>
@@ -2501,6 +2813,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-togglebtn</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-togglebtn</configure-command>
@@ -2517,6 +2830,7 @@ Default: 1.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-treectrl</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-treectrl</configure-command>
@@ -2537,6 +2851,7 @@ Features relating to images</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -2555,6 +2870,7 @@ This class is needed by wxNotebook, wxTreeCtrl and wxListCtrl.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-imaglist</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-imaglist</configure-command>
@@ -2582,6 +2898,7 @@ Recommended setting: default or 0 for everything for portable programs.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command>--enable-metafile</configure-command>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command>--enable-metafile</configure-command>
@@ -2599,6 +2916,7 @@ Enhanced metafile (recommended).</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -2615,6 +2933,7 @@ Enhanced metafile (recommended).</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -2636,6 +2955,7 @@ Default: 1. Recommended value: 1.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dragimage</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dragimage</configure-command>
@@ -2658,6 +2978,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-image</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-image</configure-command>
@@ -2676,6 +2997,7 @@ Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libpng</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libpng</configure-command>
@@ -2698,6 +3020,7 @@ Set to 1 for JPEG format support (requires libjpeg).
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libjpeg</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libjpeg</configure-command>
@@ -2721,6 +3044,7 @@ Set to 1 for TIFF format support (requires libtiff).
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libtiff</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libtiff</configure-command>
@@ -2744,6 +3068,7 @@ Set to 1 for read-only GIF format support.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-gif</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-gif</configure-command>
@@ -2763,6 +3088,7 @@ Set to 1 for PNM format support.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-pnm</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-pnm</configure-command>
@@ -2782,6 +3108,7 @@ Set to 1 for PCX format support.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-pcx</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-pcx</configure-command>
@@ -2801,6 +3128,7 @@ Set to 1 for PCX format support.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-iff</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-iff</configure-command>
@@ -2820,6 +3148,7 @@ Set to 1 for XPM format support.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-xpm</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-xpm</configure-command>
@@ -2838,6 +3167,7 @@ Set to 1 for MS Icons and Cursors format support.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command>--enable-icocur</configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command>--enable-icocur</configure-command>
@@ -2858,6 +3188,7 @@ Set to 1 to enable the wxPalette class.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-palette</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-palette</configure-command>
@@ -2878,6 +3209,7 @@ wxColourDialog and wxDirDialog.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -2898,6 +3230,7 @@ Default: 0. Recommended setting: 0
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -2921,6 +3254,7 @@ Default: 1. Recommended setting: 1 (unless it really doesn't work)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-commondlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-commondlg</configure-command>
@@ -2940,6 +3274,7 @@ wxBusyInfo displays window with a message when the app is busy. Works in the sam
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-busyinfo</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-busyinfo</configure-command>
@@ -2959,6 +3294,7 @@ wxBusyInfo displays window with a message when the app is busy. Works in the sam
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-choicedlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-choicedlg</configure-command>
@@ -2980,6 +3316,7 @@ Default: 1. Recommended setting: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-coldlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-coldlg</configure-command>
@@ -3001,6 +3338,7 @@ Default: 1. Recommended setting: 1.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dirdlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dirdlg</configure-command>
@@ -3022,6 +3360,7 @@ Default: 1. Recommended setting: 1 (used in many places in the library itself)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-filedlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-filedlg</configure-command>
@@ -3041,6 +3380,7 @@ Default: 1. Recommended setting: 1 (used in many places in the library itself)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-finddlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-finddlg</configure-command>
@@ -3062,6 +3402,7 @@ Default: 1. Recommended setting: 1 (used in the library itself)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-fontdlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-fontdlg</configure-command>
@@ -3081,6 +3422,7 @@ Default: 1. Recommended setting: 1 (used in the library itself)
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -3100,6 +3442,7 @@ Progress dialog class for lengthy operations
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-msgdlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-msgdlg</configure-command>
@@ -3120,6 +3463,7 @@ Support for startup tips.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-tipdlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-tipdlg</configure-command>
@@ -3139,6 +3483,7 @@ Text entry dialog and wxGetTextFromUser function.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-textdlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-textdlg</configure-command>
@@ -3157,6 +3502,7 @@ Number entry dialog. This option is not currently used.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-numberdlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-numberdlg</configure-command>
@@ -3175,6 +3521,7 @@ A splash window.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-splash</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-splash</configure-command>
@@ -3193,6 +3540,7 @@ The wizard dialog.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-wizarddlg</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-wizarddlg</configure-command>
@@ -3212,6 +3560,7 @@ This category consists of large components, such as the printing and document/vi
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -3227,6 +3576,7 @@ This category consists of large components, such as the printing and document/vi
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-docview</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-docview</configure-command>
@@ -3243,6 +3593,7 @@ This category consists of large components, such as the printing and document/vi
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-mdi</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-mdi</configure-command>
@@ -3262,6 +3613,7 @@ Your application can still print without this, but it is highly recommended that
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-printarch</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-printarch</configure-command>
@@ -3280,6 +3632,7 @@ The wxHTML subsystem consists of wxHtmlWindow, wxHtmlHelpController, wxHtmlEasyP
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-html</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-html</configure-command>
@@ -3297,6 +3650,7 @@ The wxHTML subsystem consists of wxHtmlWindow, wxHtmlHelpController, wxHtmlEasyP
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -3315,6 +3669,7 @@ Default: 1 Recommended setting: 1 (can be set to 0 if you don't use the command
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-cmdline</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-cmdline</configure-command>
@@ -3339,6 +3694,7 @@ Default: 1. Recommended setting: 0 unless you do plan to develop MT applications
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-threads</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-threads</configure-command>
@@ -3358,6 +3714,7 @@ _() macro, wxLocale class. Requires wxTextFile.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-intl</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-intl</configure-command>
@@ -3379,6 +3736,7 @@ Default: 1. Required by wxUSE_DIALUP_MANAGER.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dynlib</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dynlib</configure-command>
@@ -3397,6 +3755,7 @@ Experimental, don't use for now</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dynamicloader</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dynamicloader</configure-command>
@@ -3415,6 +3774,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-fontmap</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-fontmap</configure-command>
@@ -3433,6 +3793,7 @@ A class for setting miscellaneous options that do not fit in with the wxWindows
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-sysoptions</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-sysoptions</configure-command>
@@ -3451,6 +3812,7 @@ Simple .wav class for short sounds.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-wave</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-wave</configure-command>
@@ -3467,6 +3829,7 @@ Simple .wav class for short sounds.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-accel</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-accel</configure-command>
@@ -3484,6 +3847,7 @@ under Windows).</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-caret</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-caret</configure-command>
@@ -3507,6 +3871,7 @@ Recommended setting: 1 if you need it, can be safely set to 0 otherwise
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-display</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-display</configure-command>
@@ -3525,6 +3890,7 @@ wxMenu, wxMenuBar. Should not be disabled.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-menus</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-menus</configure-command>
@@ -3541,6 +3907,7 @@ wxMenu, wxMenuBar. Should not be disabled.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-validators</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-validators</configure-command>
@@ -3559,11 +3926,12 @@ Requires wxUSE_OLE.&lt;P&gt;
 
 Default: 0. Recommended setting: 0
 </description>
 
 Default: 0. Recommended setting: 0
 </description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-accessibility</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-accessibility</configure-command>
@@ -3585,6 +3953,7 @@ Default: 1. Recommended value: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-snglinst</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-snglinst</configure-command>
@@ -3605,6 +3974,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-constraints</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-constraints</configure-command>
@@ -3625,6 +3995,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-splines</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-splines</configure-command>
@@ -3645,6 +4016,7 @@ NOW MANDATORY: don't change.
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -3663,6 +4035,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-zlib</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-zlib</configure-command>
@@ -3686,6 +4059,7 @@ Data transfer encompasses clipboard and drag-and-drop operations.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -3705,6 +4079,7 @@ Default: 1. Recommended value: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-clipboard</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-clipboard</configure-command>
@@ -3726,6 +4101,7 @@ Default: 1. Recommended value: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dataobj</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dataobj</configure-command>
@@ -3747,6 +4123,7 @@ Default: 1. Recommended value: 1
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dnd</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-dnd</configure-command>
@@ -3764,6 +4141,7 @@ Default: 1. Recommended value: 1
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -3783,6 +4161,7 @@ Default: 1.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-help</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-help</configure-command>
@@ -3802,6 +4181,7 @@ Default: 1.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command>--enable-mshtmlhelp</configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command>--enable-mshtmlhelp</configure-command>
@@ -3822,6 +4202,7 @@ Default: 1</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-htmlhelp</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--enable-htmlhelp</configure-command>
@@ -3839,6 +4220,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-tooltips</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-tooltips</configure-command>
@@ -3858,6 +4240,7 @@ Settings for various input devices.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -3877,6 +4260,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context>__WXMSW__</context>
                 <configure-command></configure-command>
@@ -3897,6 +4281,7 @@ Default: 1</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-joystick</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-joystick</configure-command>
@@ -3916,6 +4301,7 @@ See also: &lt;font color="#0000FF"&gt;Large components&lt;/font&gt; for wxUSE_PR
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -3933,6 +4319,7 @@ Enables PostScript printing support.</description>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-postscript</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--enable-postscript</configure-command>
@@ -3951,6 +4338,7 @@ Set to 1 to use font metric files in GetTextExtent.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
@@ -3969,6 +4357,7 @@ Enables PostScript on MS Windows.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
@@ -3987,6 +4376,7 @@ Enables PostScript on MS Windows.</description>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -4002,11 +4392,12 @@ Enables wxDb and related classes for
 accessing ODBC on all supported platforms.&lt;P&gt;
 
 Default: 0</description>
 accessing ODBC on all supported platforms.&lt;P&gt;
 
 Default: 0</description>
-                <default-state>1</default-state>
+                <default-state>0</default-state>
                 <requires></requires>
                 <precludes>wxUSE_UNICODE</precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <requires></requires>
                 <precludes>wxUSE_UNICODE</precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-odbc</configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command>--with-odbc</configure-command>
@@ -4028,6 +4419,7 @@ Default: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
@@ -4045,11 +4437,12 @@ member variables.  With a setting of 1, full backward compatability with the 2.0
 
 Default: 0
 </description>
 
 Default: 0
 </description>
-                    <default-state>1</default-state>
+                    <default-state>0</default-state>
                     <requires></requires>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <requires></requires>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command></configure-command>
@@ -4068,6 +4461,7 @@ Default: 0
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
             <precludes></precludes>
             <enabled-if></enabled-if>
             <enabled-if-not></enabled-if-not>
+            <indeterminate-if></indeterminate-if>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
             <exclusivity></exclusivity>
             <context></context>
             <configure-command></configure-command>
@@ -4083,6 +4477,7 @@ Default: 0
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -4103,6 +4498,7 @@ Default: 1. Recommended setting: 1, set to 0 for a small library size reduction.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4124,6 +4520,7 @@ Default: 1 for compilers which support it  Recommended setting: 1, only set it t
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4144,6 +4541,7 @@ Default: 1</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4165,6 +4563,7 @@ Default: 0. Recommended setting: 0 unless you really have to use MFC
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4186,6 +4585,7 @@ Default: 1. Recommended setting: 1
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command>--enable-ole</configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command>--enable-ole</configure-command>
@@ -4205,6 +4605,7 @@ Set to 1 to compile MS Windows XP theme engine support.
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4225,6 +4626,7 @@ Set to 1 to auto-adapt to MS Windows XP themes where possible
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4245,6 +4647,7 @@ Default: 1</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4265,6 +4668,7 @@ Default: 0
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXMSW__</context>
                     <configure-command></configure-command>
@@ -4282,6 +4686,7 @@ Default: 0
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
+                <indeterminate-if></indeterminate-if>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
                 <exclusivity></exclusivity>
                 <context></context>
                 <configure-command></configure-command>
@@ -4299,6 +4704,7 @@ Try to compile and run a test GTK program.</description>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXGTK__</context>
                     <configure-command>--enable-gtktest</configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXGTK__</context>
                     <configure-command>--enable-gtktest</configure-command>
@@ -4317,6 +4723,7 @@ Prefix where GTK+ is installed (optional). Type the prefix into the &lt;b&gt;val
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXGTK__</context>
                     <configure-command>--with-gtk-prefix</configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXGTK__</context>
                     <configure-command>--with-gtk-prefix</configure-command>
@@ -4338,6 +4745,7 @@ Exec prefix where GTK+ is installed (optional). Type the prefix into the &lt;b&g
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context>__WXGTK__</context>
                     <configure-command>--with-gtk-exec-prefix</configure-command>
                     <exclusivity></exclusivity>
                     <context>__WXGTK__</context>
                     <configure-command>--with-gtk-exec-prefix</configure-command>
@@ -4359,6 +4767,7 @@ Search for libiconv in DIR/include and DIR/lib. Type the prefix into the &lt;b&g
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <precludes></precludes>
                     <enabled-if></enabled-if>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libiconv-prefix</configure-command>
                     <exclusivity></exclusivity>
                     <context></context>
                     <configure-command>--with-libiconv-prefix</configure-command>
@@ -4370,18 +4779,19 @@ Type the prefix into the <B>value</B> property."></value>
                 </setting>
                 <setting type="bool-check">
                     <active>0</active>
                 </setting>
                 <setting type="bool-check">
                     <active>0</active>
-                    <enabled>1</enabled>
+                    <enabled>0</enabled>
                     <name>wxUSE_X</name>
                     <description>&lt;B&gt;Use X&lt;/B&gt;&lt;P&gt;
 
 Use the X window system.</description>
                     <default-state>1</default-state>
                     <name>wxUSE_X</name>
                     <description>&lt;B&gt;Use X&lt;/B&gt;&lt;P&gt;
 
 Use the X window system.</description>
                     <default-state>1</default-state>
-                    <requires></requires>
+                    <requires>__WXGTK__,__WXMOTIF__,__WXX11__</requires>
                     <precludes></precludes>
                     <precludes></precludes>
-                    <enabled-if></enabled-if>
+                    <enabled-if>__WXGTK__,__WXMOTIF__,__WXX11__</enabled-if>
                     <enabled-if-not></enabled-if-not>
                     <enabled-if-not></enabled-if-not>
+                    <indeterminate-if></indeterminate-if>
                     <exclusivity></exclusivity>
                     <exclusivity></exclusivity>
-                    <context>__WXGTK__</context>
+                    <context></context>
                     <configure-command>--with-x</configure-command>
                     <help-topic></help-topic>
                     <notes></notes>
                     <configure-command>--with-x</configure-command>
                     <help-topic></help-topic>
                     <notes></notes>
diff --git a/utils/configtool/docs/manual/configtool.tex b/utils/configtool/docs/manual/configtool.tex
index dc291680b9f5fd76f96430773be852cae3dd33d2..b0cf64994cb9df8a0499d0a6b2920040911b645c 100644 (file)
--- a/utils/configtool/docs/manual/configtool.tex
+++ b/utils/configtool/docs/manual/configtool.tex
@@ -386,6 +386,8 @@ with files.
 \twocolitem{{\bf Save Setup.h...} (Ctrl+H)}{Saves the generated setup.h file in the specified location.}
 \twocolitem{{\bf Save Configure Script...} (Ctrl+G)}{Saves the generated script containing a configure command in the specified location.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
 \twocolitem{{\bf Save Setup.h...} (Ctrl+H)}{Saves the generated setup.h file in the specified location.}
 \twocolitem{{\bf Save Configure Script...} (Ctrl+G)}{Saves the generated script containing a configure command in the specified location.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
+\twocolitem{{\bf Go} (F5)}{Saves the generated setup.h file or configurewx.sh script (according to the default setting) in the last-saved.}
+\twocolitem{\hrule}{\htmlonly{\hrule}}
 \twocolitem{{\bf Exit} (Alt+F4)}{Exits the program.}
 \end{twocollist}
 
 \twocolitem{{\bf Exit} (Alt+F4)}{Exits the program.}
 \end{twocollist}
 
@@ -494,6 +496,8 @@ commands.
 \twocolitem{\image{}{cut.png}{\bf  Cut}}{Cuts the selected option and copies it to the internal clipboard..}
 \twocolitem{\image{}{paste.png}{\bf  Paste}}{Pastes the option from the clipboard to the configuration tree.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
 \twocolitem{\image{}{cut.png}{\bf  Cut}}{Cuts the selected option and copies it to the internal clipboard..}
 \twocolitem{\image{}{paste.png}{\bf  Paste}}{Pastes the option from the clipboard to the configuration tree.}
 \twocolitem{\hrule}{\htmlonly{\hrule}}
+\twocolitem{\image{}{go.png}{\bf Go}}{Saves the generated setup.h file or configurewx.sh script (according to the default setting) in the last-saved.}
+\twocolitem{\hrule}{\htmlonly{\hrule}}
 \twocolitem{\image{}{help.png}{\bf  Help}}{Shows the wxWindows manual topic for the
 \twocolitem{\image{}{helpcs.png}{\bf  Context Help}}{Shows a context-sensitive help
 cursor; click on a window to show brief help about that window.}
 \twocolitem{\image{}{help.png}{\bf  Help}}{Shows the wxWindows manual topic for the
 \twocolitem{\image{}{helpcs.png}{\bf  Context Help}}{Shows a context-sensitive help
 cursor; click on a window to show brief help about that window.}
@@ -605,6 +609,11 @@ or group. For each radio option, all other mutually
 exclusive options need to be listed. See the
 {\bf Target} group for an example of this.
 
 exclusive options need to be listed. See the
 {\bf Target} group for an example of this.
 
+The results of these dependencies can be overridden by
+indeterminate-if, which is done last of all and can
+make the option user-selectable when otherwise it
+would be constrained to be enabled or disabled.
+
 \section{How \ctshortname generates the configure commands}
 
 If the {\bf configure} property isn't empty,
 \section{How \ctshortname generates the configure commands}
 
 If the {\bf configure} property isn't empty,
@@ -657,8 +666,8 @@ if the option is constrained to always be disabled
 or enabled in the current context, then it is greyed out
 (deactivated) to prevent the user from changing the state.
 
 or enabled in the current context, then it is greyed out
 (deactivated) to prevent the user from changing the state.
 
-There are four kinds of dependencies: requires, precludes,
-enabled-if, and enabled-if-not. Each one represents a
+There are five kinds of dependencies: requires, precludes,
+enabled-if, enabled-if-not, and indeterminate-if. Each one represents a
 relationship between the current option (a) and one
 or more named options (b). For the sake of argument
 we will consider only one other option, but multiple
 relationship between the current option (a) and one
 or more named options (b). For the sake of argument
 we will consider only one other option, but multiple
@@ -715,6 +724,24 @@ For example, wxUSE_TOOLBAR_SIMPLE enabled-if-not wxUSE_TOOLBAR_NATIVE.
     1        1
 \end{verbatim}
 
     1        1
 \end{verbatim}
 
+5. a {\bf indeterminate-if} b
+
+For example, wxUSE_UNICODE indeterminate-if Custom.
+
+\begin{verbatim}
+    a        b
+
+    ?        1
+\end{verbatim}
+
+This overrides all the other dependencies, and allows you
+to make an option user-choosable in some circumstances,
+when otherwise it would be constrained to be either enabled or
+disabled. You may need to use an intermediate option to
+make sensible use of this: for example make the intermediate
+option dependent on a number of factors, such as Unicode not being
+available on some platforms.
+
 \section{How to specify platform-specific dependencies}\label{platformdependencies}
 
 You can associate one or more options as part of the
 \section{How to specify platform-specific dependencies}\label{platformdependencies}
 
 You can associate one or more options as part of the
diff --git a/utils/configtool/docs/manual/go.png b/utils/configtool/docs/manual/go.png
new file mode 100644 (file)
index 0000000..18ca287
Binary files /dev/null and b/utils/configtool/docs/manual/go.png differ
diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index 4693cc4d2764aefa577f83d8b6c255247c2912b3..1f0bf6cf64f24cfa213b46f49114d71c6a4e82b7 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -75,6 +75,7 @@ ctSettings::ctSettings()
     m_frameworkDir = wxEmptyString;
     m_matchWholeWord = FALSE;
     m_matchCase = FALSE;
     m_frameworkDir = wxEmptyString;
     m_matchWholeWord = FALSE;
     m_matchCase = FALSE;
+    m_defaultFileKind = wxT("Setup file");
 }
 
 // Copy constructor
 }
 
 // Copy constructor
@@ -95,7 +96,7 @@ void ctSettings::operator = (const ctSettings& settings)
 
 void ctSettings::Copy (const ctSettings& settings)
 {
 
 void ctSettings::Copy (const ctSettings& settings)
 {
-    m_currentDocumentDir = settings.m_currentDocumentDir;
+    m_lastSetupSaveDir = settings.m_lastSetupSaveDir;
     m_lastDocument = settings.m_lastDocument;
     m_showToolBar = settings.m_showToolBar;
     m_frameSize = settings.m_frameSize;
     m_lastDocument = settings.m_lastDocument;
     m_showToolBar = settings.m_showToolBar;
     m_frameSize = settings.m_frameSize;
@@ -118,12 +119,13 @@ void ctSettings::Copy (const ctSettings& settings)
     m_frameworkDir = settings.m_frameworkDir;
     m_matchWholeWord = settings.m_matchWholeWord;
     m_matchCase = settings.m_matchCase;
     m_frameworkDir = settings.m_frameworkDir;
     m_matchWholeWord = settings.m_matchWholeWord;
     m_matchCase = settings.m_matchCase;
+    m_defaultFileKind  = settings.m_defaultFileKind ;
 }
 
 // Do some initialisation within stApp::OnInit
 bool ctSettings::Init()
 {
 }
 
 // Do some initialisation within stApp::OnInit
 bool ctSettings::Init()
 {
-    m_currentDocumentDir = wxEmptyString;
+    m_lastSetupSaveDir = wxEmptyString;
     if (m_userName.IsEmpty())
         m_userName = wxGetUserName();
 
     if (m_userName.IsEmpty())
         m_userName = wxGetUserName();
 
@@ -164,7 +166,7 @@ bool ctSettings::LoadConfig()
     wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
 
     config.Read(wxT("Files/LastFile"), & m_lastFilename);
     wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
 
     config.Read(wxT("Files/LastFile"), & m_lastFilename);
-    config.Read(wxT("Files/DocumentDir"), & m_currentDocumentDir);
+    config.Read(wxT("Files/LastSetupSaveDir"), & m_lastSetupSaveDir);
     config.Read(wxT("Files/ExportDir"), & m_exportDir);
     config.Read(wxT("Files/FrameworkDir"), & m_frameworkDir);
     config.Read(wxT("Files/UseEnvironmentVariable"), (bool*) & m_useEnvironmentVariable);
     config.Read(wxT("Files/ExportDir"), & m_exportDir);
     config.Read(wxT("Files/FrameworkDir"), & m_frameworkDir);
     config.Read(wxT("Files/UseEnvironmentVariable"), (bool*) & m_useEnvironmentVariable);
@@ -179,6 +181,7 @@ bool ctSettings::LoadConfig()
     config.Read(wxT("Misc/ShowTrayIcon"), (bool*) & m_showTrayIcon);
     config.Read(wxT("Misc/MatchWholeWord"), (bool*) & m_matchWholeWord);
     config.Read(wxT("Misc/MatchCase"), (bool*) & m_matchCase);
     config.Read(wxT("Misc/ShowTrayIcon"), (bool*) & m_showTrayIcon);
     config.Read(wxT("Misc/MatchWholeWord"), (bool*) & m_matchWholeWord);
     config.Read(wxT("Misc/MatchCase"), (bool*) & m_matchCase);
+    config.Read(wxT("Misc/BuildMode"), & m_defaultFileKind );
 
     m_noUses ++;
 
 
     m_noUses ++;
 
@@ -224,7 +227,7 @@ bool ctSettings::SaveConfig()
     wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
 
     config.Write(wxT("Files/LastFile"), m_lastFilename);
     wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
 
     config.Write(wxT("Files/LastFile"), m_lastFilename);
-    config.Write(wxT("Files/DocumentDir"), m_currentDocumentDir);
+    config.Write(wxT("Files/LastSetupSaveDir"), m_lastSetupSaveDir);
     config.Write(wxT("Files/ExportDir"), m_exportDir);
     config.Write(wxT("Files/FrameworkDir"), m_frameworkDir);
     config.Write(wxT("Files/UseEnvironmentVariable"), m_useEnvironmentVariable);
     config.Write(wxT("Files/ExportDir"), m_exportDir);
     config.Write(wxT("Files/FrameworkDir"), m_frameworkDir);
     config.Write(wxT("Files/UseEnvironmentVariable"), m_useEnvironmentVariable);
@@ -239,6 +242,7 @@ bool ctSettings::SaveConfig()
     config.Write(wxT("Misc/ShowTrayIcon"), (long) m_showTrayIcon);
     config.Write(wxT("Misc/MatchWholeWord"), (long) m_matchWholeWord);
     config.Write(wxT("Misc/MatchCase"), (long) m_matchCase);
     config.Write(wxT("Misc/ShowTrayIcon"), (long) m_showTrayIcon);
     config.Write(wxT("Misc/MatchWholeWord"), (long) m_matchWholeWord);
     config.Write(wxT("Misc/MatchCase"), (long) m_matchCase);
+    config.Write(wxT("Misc/BuildMode"), m_defaultFileKind);
 
     config.Write(wxT("Windows/ShowToolBar"), m_showToolBar);
     config.Write(wxT("Windows/WindowX"), (long) m_frameSize.x);
 
     config.Write(wxT("Windows/ShowToolBar"), m_showToolBar);
     config.Write(wxT("Windows/WindowX"), (long) m_frameSize.x);
diff --git a/utils/configtool/src/appsettings.h b/utils/configtool/src/appsettings.h
index 037efc7b7d5a1a34807e1d31f5e36d1e28ae2910..c702d663a126052a236256715b4314313752448a 100644 (file)
--- a/utils/configtool/src/appsettings.h
+++ b/utils/configtool/src/appsettings.h
@@ -87,7 +87,7 @@ public:
     bool GetFirstTimeRun() const { return m_firstTimeRun; }
 
 public:
     bool GetFirstTimeRun() const { return m_firstTimeRun; }
 
 public:
-    wxString                m_currentDocumentDir; // Not yet used
+    wxString                m_lastSetupSaveDir; // Not yet used
     wxString                m_lastDocument;       // Last document
     bool                    m_showToolBar;
     bool                    m_smallToolbar;
     wxString                m_lastDocument;       // Last document
     bool                    m_showToolBar;
     bool                    m_smallToolbar;
@@ -118,6 +118,9 @@ public:
     bool                    m_showTrayIcon;
     bool                    m_trayIconIsShown;
 
     bool                    m_showTrayIcon;
     bool                    m_trayIconIsShown;
 
+    // "Setup file" or "Configure script"
+    wxString                m_defaultFileKind;
+
     // Search settings
     bool                    m_matchCase;
     bool                    m_matchWholeWord;
     // Search settings
     bool                    m_matchCase;
     bool                    m_matchWholeWord;
diff --git a/utils/configtool/src/bitmaps/go.xpm b/utils/configtool/src/bitmaps/go.xpm
new file mode 100644 (file)
index 0000000..c19422a
--- /dev/null
+++ b/utils/configtool/src/bitmaps/go.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static char *go_xpm[] = {
+"16 15 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"     ..         ",
+"     ...        ",
+"     ....       ",
+"     .....      ",
+"     ......     ",
+"     .......    ",
+"     ........   ",
+"     .......    ",
+"     ......     ",
+"     .....      ",
+"     ....       ",
+"     ...        ",
+"     ..         ",
+"                "};
diff --git a/utils/configtool/src/configitem.cpp b/utils/configtool/src/configitem.cpp
index ca5c26827000586a4cd5c0d1971cc70a85338f11..01e8c4d1cbcad192f8a00e58e9b1277a83e8dc86 100644 (file)
--- a/utils/configtool/src/configitem.cpp
+++ b/utils/configtool/src/configitem.cpp
@@ -220,6 +220,12 @@ void ctConfigItem::InitProperties()
         wxVariant(wxT(""), wxT("enabled-if-not")),
         wxT("configitems")));
 
         wxVariant(wxT(""), wxT("enabled-if-not")),
         wxT("configitems")));
 
+    m_properties.AddProperty(
+        new ctProperty(
+        wxT("<B>Indeterminate-if</B><P> When any of these settings are 1, this setting becomes active and indeterminate. Taking wxUSE_UNICODE as an example:<P>If Custom is 1, wxUSE_UNICODE is indeterminate."),
+        wxVariant(wxT(""), wxT("indeterminate-if")),
+        wxT("configitems")));
+
     m_properties.AddProperty(
         new ctProperty(
         wxT("<B>Exclusivity</B><P> The settings that are mutually exclusive with this one."),
     m_properties.AddProperty(
         new ctProperty(
         wxT("<B>Exclusivity</B><P> The settings that are mutually exclusive with this one."),
@@ -266,6 +272,7 @@ void ctConfigItem::ApplyProperty(ctProperty* prop, const wxVariant& oldValue)
         name == wxT("precludes") ||
         name == wxT("enabled-if") ||
         name == wxT("enabled-if-not") ||
         name == wxT("precludes") ||
         name == wxT("enabled-if") ||
         name == wxT("enabled-if-not") ||
+        name == wxT("indeterminate-if") ||
         name == wxT("context"))
     {
         doc->RefreshDependencies();
         name == wxT("context"))
     {
         doc->RefreshDependencies();
@@ -481,11 +488,14 @@ bool ctConfigItem::IsInActiveContext()
 /// then this one is disabled (and inactive).
 void ctConfigItem::EvaluateDependencies()
 {
 /// then this one is disabled (and inactive).
 void ctConfigItem::EvaluateDependencies()
 {
+    // For debugging purposes
+    wxString name = GetName();
     wxList items;
     wxString requires = GetPropertyString(wxT("requires"));
     wxString precludes = GetPropertyString(wxT("precludes"));
     wxString enabledIf = GetPropertyString(wxT("enabled-if"));
     wxString enabledIfNot = GetPropertyString(wxT("enabled-if-not"));
     wxList items;
     wxString requires = GetPropertyString(wxT("requires"));
     wxString precludes = GetPropertyString(wxT("precludes"));
     wxString enabledIf = GetPropertyString(wxT("enabled-if"));
     wxString enabledIfNot = GetPropertyString(wxT("enabled-if-not"));
+    wxString indeterminateIf = GetPropertyString(wxT("indeterminate-if"));
 
     bool active = TRUE;
     bool enabled = IsEnabled();
 
     bool active = TRUE;
     bool enabled = IsEnabled();
@@ -581,6 +591,7 @@ void ctConfigItem::EvaluateDependencies()
         for ( wxNode* node = items.GetFirst(); node; node = node->GetNext() )
         {
             ctConfigItem* otherItem = (ctConfigItem*) node->GetData();
         for ( wxNode* node = items.GetFirst(); node; node = node->GetNext() )
         {
             ctConfigItem* otherItem = (ctConfigItem*) node->GetData();
+            wxString otherName = otherItem->GetName();
             
             if (inActiveContext && otherItem->IsInActiveContext())
             {
             
             if (inActiveContext && otherItem->IsInActiveContext())
             {
@@ -608,6 +619,7 @@ void ctConfigItem::EvaluateDependencies()
     {
         StringToItems(GetDocument()->GetTopItem(), precludes, items);
         int enabledCount = 0;
     {
         StringToItems(GetDocument()->GetTopItem(), precludes, items);
         int enabledCount = 0;
+        // int disabledCount = 0;
         int inContextCount = 0;
 
         for ( wxNode* node = items.GetFirst(); node; node = node->GetNext() )
         int inContextCount = 0;
 
         for ( wxNode* node = items.GetFirst(); node; node = node->GetNext() )
@@ -616,20 +628,55 @@ void ctConfigItem::EvaluateDependencies()
             
             if (inActiveContext && otherItem->IsInActiveContext())
             {
             
             if (inActiveContext && otherItem->IsInActiveContext())
             {
-                // Make this enabled and inactive, _unless_ it's
-                // already been explicitly disabled in the previous
-                // requires evaluation (it really _has_ to be off)
+                // Make this disabled and inactive, _unless_ it's
+                // already been explicitly enabled in the previous
+                // requires evaluation (it really _has_ to be on)
+//                if (!otherItem->IsEnabled())
                 if (otherItem->IsEnabled())
                 {
                     enabledCount ++;
                 if (otherItem->IsEnabled())
                 {
                     enabledCount ++;
+                    // disabledCount ++;
                 }
                 }
+                inContextCount ++;
             }
         }
         // Disable if there were no related items that were disabled
             }
         }
         // Disable if there were no related items that were disabled
-        if (inContextCount > 0 && (enabledCount == inContextCount) && !explicitlyEnabled)
+        if (inContextCount > 0 && (enabledCount > 0) && !explicitlyEnabled)
+//        if (inContextCount > 0 && (disabledCount > 0) && !explicitlyEnabled)
         {
             enabled = FALSE;
             active = FALSE;
         {
             enabled = FALSE;
             active = FALSE;
+            explicitlyDisabled = TRUE;
+        }
+    }
+
+    // Indeterminate overrides the others, and
+    // makes the item active.
+    items.Clear();
+    if (!indeterminateIf.IsEmpty())
+    {
+        StringToItems(GetDocument()->GetTopItem(), indeterminateIf, items);
+        int enabledCount = 0;
+        int inContextCount = 0;
+
+        for ( wxNode* node = items.GetFirst(); node; node = node->GetNext() )
+        {
+            ctConfigItem* otherItem = (ctConfigItem*) node->GetData();
+            
+            if (inActiveContext && otherItem->IsInActiveContext())
+            {
+                if (otherItem->IsEnabled())
+                {
+                    enabledCount ++;
+                }
+                inContextCount ++;
+            }
+        }
+        if (inContextCount > 0 && enabledCount > 0)
+        {
+            active = TRUE;
+            explicitlyEnabled = FALSE;
+            explicitlyDisabled = FALSE;
         }
     }
 
         }
     }
 
@@ -637,6 +684,13 @@ void ctConfigItem::EvaluateDependencies()
     // context is active. If not, make this inactive.
     if (!IsInActiveContext())
         active = FALSE;
     // context is active. If not, make this inactive.
     if (!IsInActiveContext())
         active = FALSE;
+    else
+    {        
+        // If we didn't explicitly enable or disable it,
+        // then we should make it active.
+        if (!explicitlyEnabled && !explicitlyDisabled)
+            active = TRUE;
+    }
 
     SetActive(active);
 
 
     SetActive(active);
 
diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index 3a50aadd83ef14d9a09c171bd674952fdf031946..660af435357e82289bdb5d2c19babf8dfc25e5a8 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -575,6 +575,7 @@ void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
     wxString precludes = item->GetPropertyString(wxT("precludes"));
     wxString enabledIf = item->GetPropertyString(wxT("enabled-if"));
     wxString enabledIfNot = item->GetPropertyString(wxT("enabled-if-not"));
     wxString precludes = item->GetPropertyString(wxT("precludes"));
     wxString enabledIf = item->GetPropertyString(wxT("enabled-if"));
     wxString enabledIfNot = item->GetPropertyString(wxT("enabled-if-not"));
+    wxString indeterminateIf = item->GetPropertyString(wxT("indeterminate-if"));
     wxString context = item->GetPropertyString(wxT("context"));
 
     if (!requires.IsEmpty())
     wxString context = item->GetPropertyString(wxT("context"));
 
     if (!requires.IsEmpty())
@@ -589,6 +590,9 @@ void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
     if (!enabledIf.IsEmpty())
         item->StringToArray(enabledIf, requiresArr);
 
     if (!enabledIf.IsEmpty())
         item->StringToArray(enabledIf, requiresArr);
 
+    if (!indeterminateIf.IsEmpty())
+        item->StringToArray(indeterminateIf, requiresArr);
+
     // Add the parent to the list of dependencies, if the
     // parent is a check or radio group.
     ctConfigItem* parent = item->GetParent();
     // Add the parent to the list of dependencies, if the
     // parent is a check or radio group.
     ctConfigItem* parent = item->GetParent();
diff --git a/utils/configtool/src/configtoolview.cpp b/utils/configtool/src/configtoolview.cpp
index 5f62dcb51a4adee2e35b397b6a022d48929943a6..138fc3eac5c7fd8287ff58fec4e5efa70ed7b530 100644 (file)
--- a/utils/configtool/src/configtoolview.cpp
+++ b/utils/configtool/src/configtoolview.cpp
@@ -91,6 +91,9 @@ BEGIN_EVENT_TABLE(ctConfigToolView, wxView)
     EVT_MENU(wxID_FIND, ctConfigToolView::OnFind)
     EVT_UPDATE_UI(wxID_FIND, ctConfigToolView::OnUpdateFind)
 
     EVT_MENU(wxID_FIND, ctConfigToolView::OnFind)
     EVT_UPDATE_UI(wxID_FIND, ctConfigToolView::OnUpdateFind)
 
+    EVT_MENU(ctID_GO, ctConfigToolView::OnGo)
+    EVT_UPDATE_UI(ctID_GO, ctConfigToolView::OnUpdateGo)
+
 END_EVENT_TABLE()
 
 ctConfigToolView::ctConfigToolView()
 END_EVENT_TABLE()
 
 ctConfigToolView::ctConfigToolView()
@@ -352,11 +355,17 @@ void ctConfigToolView::OnIconLeftDown(ctConfigTreeCtrl* treeControl, ctConfigIte
         SyncItem(treeControl, item);
 
         wxList considered;
         SyncItem(treeControl, item);
 
         wxList considered;
-        item->PropagateChange(considered);
         if ((item->GetType() == ctTypeBoolRadio || item->GetType() == ctTypeRadioGroup) && item->IsEnabled())
         {
             item->PropagateRadioButton(considered);
         }
         if ((item->GetType() == ctTypeBoolRadio || item->GetType() == ctTypeRadioGroup) && item->IsEnabled())
         {
             item->PropagateRadioButton(considered);
         }
+        item->PropagateChange(considered);
+
+        // Update the setup.h and configure text
+        if (wxGetApp().GetMainFrame()->GetMainNotebook()->GetSelection() > 0)
+        {
+            RegenerateSetup();
+        }
     }
 }
 
     }
 }
 
@@ -905,7 +914,9 @@ void ctConfigToolView::OnSaveSetupFile(wxCommandEvent& event)
     wxString setupStr = doc->GenerateSetup();
 
     wxString filename = _T("setup.h");
     wxString setupStr = doc->GenerateSetup();
 
     wxString filename = _T("setup.h");
-    wxString path = doc->GetFrameworkDir(FALSE);
+    wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
+    if (path.IsEmpty())
+        path = doc->GetFrameworkDir(FALSE);
     wxString wildcard = _T("Header files (*.h)|*.h|All files (*.*)|*.*");
     
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
     wxString wildcard = _T("Header files (*.h)|*.h|All files (*.*)|*.*");
     
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
@@ -916,8 +927,7 @@ void ctConfigToolView::OnSaveSetupFile(wxCommandEvent& event)
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
-
-        // TODO: save last saved path in settings.
+        wxGetApp().GetSettings().m_lastSetupSaveDir = wxPathOnly(fullPath);
 
         wxFileOutputStream stream(fullPath);
         if (!stream.Ok())
 
         wxFileOutputStream stream(fullPath);
         if (!stream.Ok())
@@ -936,7 +946,9 @@ void ctConfigToolView::OnSaveConfigureCommand(wxCommandEvent& event)
     wxString configureStr = doc->GenerateConfigureCommand();
 
     wxString filename = _T("configurewx.sh");
     wxString configureStr = doc->GenerateConfigureCommand();
 
     wxString filename = _T("configurewx.sh");
-    wxString path = doc->GetFrameworkDir(FALSE);
+    wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
+    if (path.IsEmpty())
+        path = doc->GetFrameworkDir(FALSE);
     wxString wildcard = _T("Shell script files (*.sh)|*.sh|All files (*.*)|*.*");
     
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
     wxString wildcard = _T("Shell script files (*.sh)|*.sh|All files (*.*)|*.*");
     
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
@@ -947,8 +959,7 @@ void ctConfigToolView::OnSaveConfigureCommand(wxCommandEvent& event)
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
-
-        // TODO: save last saved path in settings.
+        wxGetApp().GetSettings().m_lastSetupSaveDir = wxPathOnly(fullPath);
 
         wxFileOutputStream stream(fullPath);
         if (!stream.Ok())
 
         wxFileOutputStream stream(fullPath);
         if (!stream.Ok())
@@ -1003,6 +1014,75 @@ void ctConfigToolView::OnUpdateFind(wxUpdateUIEvent& event)
     event.Enable(TRUE);
 }
 
     event.Enable(TRUE);
 }
 
+/// Save default file type
+void ctConfigToolView::OnGo(wxCommandEvent& event)
+{
+    ctConfigToolDoc* doc = (ctConfigToolDoc*) GetDocument();
+    wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
+    if (!path.IsEmpty())
+    {
+        if (wxGetApp().GetSettings().m_defaultFileKind == wxT("Setup file"))
+        {
+            // setup.h
+            wxString setupStr = doc->GenerateSetup();
+
+            wxString fullPath = path + wxFILE_SEP_PATH + wxT("setup.h");
+            if (wxFileExists(fullPath))
+            {
+                wxString msg;
+                msg.Printf(wxT("Overwrite existing file %s?"), (const wxChar*) fullPath);
+                int ans = wxMessageBox(msg, _("Save Setup File"), wxICON_QUESTION|wxYES_NO|wxCANCEL);
+                if (ans == wxCANCEL)
+                    return;
+                if (ans == wxNO)
+                    return;
+            }
+            wxFileOutputStream stream(fullPath);
+            if (!stream.Ok())
+            {
+                wxMessageBox(_("Sorry, could not save this file."), _("Save Setup File"), wxICON_EXCLAMATION|wxOK);
+                return;
+            }
+            stream << setupStr;
+        }
+        else if (wxGetApp().GetSettings().m_defaultFileKind == wxT("Configure script"))
+        {
+            // configurewx.sh
+            wxString configureStr = doc->GenerateConfigureCommand();
+
+            wxString fullPath = path + wxFILE_SEP_PATH + wxT("configurewx.sh");
+            if (wxFileExists(fullPath))
+            {
+                wxString msg;
+                msg.Printf(wxT("Overwrite existing file %s?"), (const wxChar*) fullPath);
+                int ans = wxMessageBox(msg, _("Save Configure Script"), wxICON_QUESTION|wxYES_NO|wxCANCEL);
+                if (ans == wxCANCEL)
+                    return;
+                if (ans == wxNO)
+                    return;
+            }
+            wxFileOutputStream stream(fullPath);
+            if (!stream.Ok())
+            {
+                wxMessageBox(_("Sorry, could not save this file."), _("Save Configure Script"), wxICON_EXCLAMATION|wxOK);
+                return;
+            }
+            stream << configureStr;
+        }
+        else
+        {
+            wxMessageBox(wxT("Unrecognised default file type."));
+        }
+    }
+}
+
+/// Update
+void ctConfigToolView::OnUpdateGo(wxUpdateUIEvent& event)
+{
+    wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
+    event.Enable(!path.IsEmpty());
+}
+
 //----------------------------------------------------------------------------
 // ctFindReplaceDialog
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // ctFindReplaceDialog
 //----------------------------------------------------------------------------
diff --git a/utils/configtool/src/configtoolview.h b/utils/configtool/src/configtoolview.h
index 02ea972f5b11a43d3d2351253f4ddccf680e592c..85002eedf60ec5e2e9634e83d24fb868d3666b5a 100644 (file)
--- a/utils/configtool/src/configtoolview.h
+++ b/utils/configtool/src/configtoolview.h
@@ -199,6 +199,14 @@ public:
     /// Update find text
     void OnUpdateFind(wxUpdateUIEvent& event);
 
     /// Update find text
     void OnUpdateFind(wxUpdateUIEvent& event);
 
+    // Go (now: save setup.h or configurewx.sh. later: invoke configure/make)
+
+    /// Save default file type
+    void OnGo(wxCommandEvent& event);
+
+    /// Update
+    void OnUpdateGo(wxUpdateUIEvent& event);
+
 DECLARE_EVENT_TABLE()
 
 protected:
 DECLARE_EVENT_TABLE()
 
 protected:
diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 591e2a0026526abc2d78752960233e7282ee9b14..bfd09b31e75010dba849b613467a6113b432f736 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -46,6 +46,7 @@
 #include "bitmaps/undo.xpm"
 #include "bitmaps/redo.xpm"
 #include "bitmaps/helpcs.xpm"
 #include "bitmaps/undo.xpm"
 #include "bitmaps/redo.xpm"
 #include "bitmaps/helpcs.xpm"
+#include "bitmaps/go.xpm"
 
 IMPLEMENT_CLASS(ctMainFrame, wxDocParentFrame)
 
 
 IMPLEMENT_CLASS(ctMainFrame, wxDocParentFrame)
 
@@ -82,6 +83,8 @@ BEGIN_EVENT_TABLE(ctMainFrame, wxDocParentFrame)
     EVT_UPDATE_UI(ctID_SAVE_CONFIGURE_COMMAND, ctMainFrame::OnUpdateDisable)
 
     EVT_UPDATE_UI(wxID_FIND, ctMainFrame::OnUpdateDisable)
     EVT_UPDATE_UI(ctID_SAVE_CONFIGURE_COMMAND, ctMainFrame::OnUpdateDisable)
 
     EVT_UPDATE_UI(wxID_FIND, ctMainFrame::OnUpdateDisable)
+
+    EVT_UPDATE_UI(ctID_GO, ctMainFrame::OnUpdateDisable)
 END_EVENT_TABLE()
 
 // Define my frame constructor
 END_EVENT_TABLE()
 
 // Define my frame constructor
@@ -222,7 +225,7 @@ void ctMainFrame::InitToolBar(wxToolBar* toolBar)
     toolBarBitmaps[3] = wxBitmap(copy_xpm);
     toolBarBitmaps[4] = wxBitmap(cut_xpm);
     toolBarBitmaps[5] = wxBitmap(paste_xpm);
     toolBarBitmaps[3] = wxBitmap(copy_xpm);
     toolBarBitmaps[4] = wxBitmap(cut_xpm);
     toolBarBitmaps[5] = wxBitmap(paste_xpm);
-//    toolBarBitmaps[6] = wxBitmap(print_xpm);
+    toolBarBitmaps[6] = wxBitmap(go_xpm);
     toolBarBitmaps[7] = wxBitmap(help_xpm);
     toolBarBitmaps[10] = wxBitmap(undo_xpm);
     toolBarBitmaps[11] = wxBitmap(redo_xpm);
     toolBarBitmaps[7] = wxBitmap(help_xpm);
     toolBarBitmaps[10] = wxBitmap(undo_xpm);
     toolBarBitmaps[11] = wxBitmap(redo_xpm);
@@ -241,6 +244,8 @@ void ctMainFrame::InitToolBar(wxToolBar* toolBar)
     toolBar->AddTool(wxID_UNDO, toolBarBitmaps[10], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Undo"));
     toolBar->AddTool(wxID_REDO, toolBarBitmaps[11], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Redo"));
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_UNDO, toolBarBitmaps[10], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Undo"));
     toolBar->AddTool(wxID_REDO, toolBarBitmaps[11], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Redo"));
     toolBar->AddSeparator();
+    toolBar->AddTool(ctID_GO, toolBarBitmaps[6], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Save setup.h or configurewx.sh"));
+    toolBar->AddSeparator();
     toolBar->AddTool(ctID_ITEM_HELP, toolBarBitmaps[12], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Show help for this option"));
     toolBar->AddTool(wxID_HELP_CONTEXT, toolBarBitmaps[13], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Show help on the clicked item"));
 
     toolBar->AddTool(ctID_ITEM_HELP, toolBarBitmaps[12], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Show help for this option"));
     toolBar->AddTool(wxID_HELP_CONTEXT, toolBarBitmaps[13], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Show help on the clicked item"));
 
@@ -266,6 +271,8 @@ wxMenuBar* ctMainFrame::CreateMenuBar()
     fileMenu->Append(ctID_SAVE_SETUP_FILE, wxT("Save Setup.&h...\tCtrl+H"), wxT("Save the setup.h file"));
     fileMenu->Append(ctID_SAVE_CONFIGURE_COMMAND, wxT("Save Configure Script...\tCtrl+G"), wxT("Save the configure script file"));
     fileMenu->AppendSeparator();
     fileMenu->Append(ctID_SAVE_SETUP_FILE, wxT("Save Setup.&h...\tCtrl+H"), wxT("Save the setup.h file"));
     fileMenu->Append(ctID_SAVE_CONFIGURE_COMMAND, wxT("Save Configure Script...\tCtrl+G"), wxT("Save the configure script file"));
     fileMenu->AppendSeparator();
+    fileMenu->Append(ctID_GO, wxT("&Go\tF5"), wxT("Quick-save the setup.h or configure.sh file"));
+    fileMenu->AppendSeparator();
     fileMenu->Append(wxID_EXIT, wxT("E&xit\tAlt+F4"), wxT("Exit the application"));
 
     wxGetApp().GetDocManager()->FileHistoryUseMenu(fileMenu);
     fileMenu->Append(wxID_EXIT, wxT("E&xit\tAlt+F4"), wxT("Exit the application"));
 
     wxGetApp().GetDocManager()->FileHistoryUseMenu(fileMenu);
diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index 15b58330542f789a70160349454b909c487d5793..fa40c655afd7eb6542414e4b63177cd86954e036 100644 (file)
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -82,28 +82,28 @@ void ctSettingsDialog::CreateControls()
     wxNotebookSizer* item3Sizer = new wxNotebookSizer(item3);
     ctGeneralSettingsDialog* item4 = new ctGeneralSettingsDialog(item3, ID_GENERAL_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
     item3->AddPage(item4, _("General"));
     wxNotebookSizer* item3Sizer = new wxNotebookSizer(item3);
     ctGeneralSettingsDialog* item4 = new ctGeneralSettingsDialog(item3, ID_GENERAL_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
     item3->AddPage(item4, _("General"));
-    ctLocationSettingsDialog* item9 = new ctLocationSettingsDialog(item3, ID_LOCATION_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
-    item3->AddPage(item9, _("Locations"));
+    ctLocationSettingsDialog* item11 = new ctLocationSettingsDialog(item3, ID_LOCATION_SETTINGS_DIALOG, wxDefaultPosition, wxSize(100, 80), 0);
+    item3->AddPage(item11, _("Locations"));
     item2->Add(item3Sizer, 0, wxGROW|wxALL, 5);
 
     item2->Add(item3Sizer, 0, wxGROW|wxALL, 5);
 
-    wxBoxSizer* item19 = new wxBoxSizer(wxHORIZONTAL);
-    item2->Add(item19, 0, wxGROW|wxALL, 5);
+    wxBoxSizer* item21 = new wxBoxSizer(wxHORIZONTAL);
+    item2->Add(item21, 0, wxGROW|wxALL, 5);
 
 
-    item19->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    item21->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
-    wxButton* item21 = new wxButton(item1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0);
-    item21->SetDefault();
-    item19->Add(item21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxButton* item23 = new wxButton(item1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0);
+    item23->SetDefault();
+    item21->Add(item23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
-    wxButton* item22 = new wxButton(item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0);
-    item19->Add(item22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxButton* item24 = new wxButton(item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0);
+    item21->Add(item24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
-    wxButton* item23 = new wxButton(item1, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, 0);
-    item19->Add(item23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxButton* item25 = new wxButton(item1, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, 0);
+    item21->Add(item25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 #if defined(__WXGTK__) || defined(__WXMAC__)
 
 #if defined(__WXGTK__) || defined(__WXMAC__)
-    wxContextHelpButton* item24 = new wxContextHelpButton(item1, wxID_CONTEXT_HELP, wxDefaultPosition, wxSize(20, -1), wxBU_AUTODRAW);
-    item19->Add(item24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxContextHelpButton* item26 = new wxContextHelpButton(item1, wxID_CONTEXT_HELP, wxDefaultPosition, wxSize(20, -1), wxBU_AUTODRAW);
+    item21->Add(item26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 #endif
 
     GetSizer()->Fit(this);
 #endif
 
     GetSizer()->Fit(this);
@@ -219,17 +219,38 @@ void ctGeneralSettingsDialog::CreateControls()
 
     wxCheckBox* item7 = new wxCheckBox(item4, ID_LOAD_LAST_DOCUMENT, _("&Load last document"), wxDefaultPosition, wxDefaultSize, 0);
     item7->SetValue(FALSE);
 
     wxCheckBox* item7 = new wxCheckBox(item4, ID_LOAD_LAST_DOCUMENT, _("&Load last document"), wxDefaultPosition, wxDefaultSize, 0);
     item7->SetValue(FALSE);
+    item7->SetHelpText(_("Check to load the last document on startup"));
+    if (ShowToolTips())
+        item7->SetToolTip(_("Check to load the last document on startup"));
     item6->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxCheckBox* item8 = new wxCheckBox(item4, ID_SHOW_TOOLTIPS, _("&Show tooltips"), wxDefaultPosition, wxDefaultSize, 0);
     item8->SetValue(FALSE);
     item6->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxCheckBox* item8 = new wxCheckBox(item4, ID_SHOW_TOOLTIPS, _("&Show tooltips"), wxDefaultPosition, wxDefaultSize, 0);
     item8->SetValue(FALSE);
+    item8->SetHelpText(_("Check to show tooltips"));
+    if (ShowToolTips())
+        item8->SetToolTip(_("Check to show tooltips"));
     item6->Add(item8, 0, wxALIGN_LEFT|wxALL, 5);
 
     item6->Add(item8, 0, wxALIGN_LEFT|wxALL, 5);
 
+    wxStaticText* item9 = new wxStaticText(item4, wxID_STATIC, _("&Default file kind to save when using the Go command:"), wxDefaultPosition, wxDefaultSize, 0);
+    item6->Add(item9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxString item10Strings[] = {
+        _("Setup file"),
+        _("Configure script")
+    };
+    wxChoice* item10 = new wxChoice(item4, ID_DEFAULT_FILE_KIND, wxDefaultPosition, wxSize(200, -1), 2, item10Strings, 0);
+    item10->SetStringSelection(_("Setup file"));
+    item10->SetHelpText(_("Select the default kind of file to save using Go"));
+    if (ShowToolTips())
+        item10->SetToolTip(_("Select the default kind of file to save using Go"));
+    item6->Add(item10, 0, wxGROW|wxALL, 5);
+
     GetSizer()->Fit(this);
 ////@end ctGeneralSettingsDialog content construction
 
     FindWindow(ID_LOAD_LAST_DOCUMENT)->SetValidator(wxGenericValidator(& wxGetApp().GetSettings().m_loadLastDocument));
     FindWindow(ID_SHOW_TOOLTIPS)->SetValidator(wxGenericValidator(& wxGetApp().GetSettings().m_useToolTips));
     GetSizer()->Fit(this);
 ////@end ctGeneralSettingsDialog content construction
 
     FindWindow(ID_LOAD_LAST_DOCUMENT)->SetValidator(wxGenericValidator(& wxGetApp().GetSettings().m_loadLastDocument));
     FindWindow(ID_SHOW_TOOLTIPS)->SetValidator(wxGenericValidator(& wxGetApp().GetSettings().m_useToolTips));
+    FindWindow(ID_DEFAULT_FILE_KIND)->SetValidator(wxGenericValidator(& wxGetApp().GetSettings().m_defaultFileKind));
 }
 
 /*!
 }
 
 /*!
@@ -282,36 +303,45 @@ void ctLocationSettingsDialog::CreateControls()
 {    
 ////@begin ctLocationSettingsDialog content construction
 
 {    
 ////@begin ctLocationSettingsDialog content construction
 
-    ctLocationSettingsDialog* item9 = this;
+    ctLocationSettingsDialog* item11 = this;
 
 
-    wxBoxSizer* item10 = new wxBoxSizer(wxVERTICAL);
-    item9->SetSizer(item10);
-    item9->SetAutoLayout(TRUE);
+    wxBoxSizer* item12 = new wxBoxSizer(wxVERTICAL);
+    item11->SetSizer(item12);
+    item11->SetAutoLayout(TRUE);
 
 
-    wxStaticBox* item11Static = new wxStaticBox(item9, -1, _("Locations"));
-    wxStaticBoxSizer* item11 = new wxStaticBoxSizer(item11Static, wxVERTICAL);
-    item10->Add(item11, 1, wxGROW|wxALL, 5);
+    wxStaticBox* item13Static = new wxStaticBox(item11, -1, _("Locations"));
+    wxStaticBoxSizer* item13 = new wxStaticBoxSizer(item13Static, wxVERTICAL);
+    item12->Add(item13, 1, wxGROW|wxALL, 5);
 
 
-    wxStaticText* item12 = new wxStaticText(item9, wxID_STATIC, _("&wxWindows hierarchy:"), wxDefaultPosition, wxDefaultSize, 0);
-    item11->Add(item12, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
+    wxStaticText* item14 = new wxStaticText(item11, wxID_STATIC, _("&wxWindows hierarchy:"), wxDefaultPosition, wxDefaultSize, 0);
+    item13->Add(item14, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
 
-    wxBoxSizer* item13 = new wxBoxSizer(wxHORIZONTAL);
-    item11->Add(item13, 0, wxGROW, 5);
+    wxBoxSizer* item15 = new wxBoxSizer(wxHORIZONTAL);
+    item13->Add(item15, 0, wxGROW, 5);
 
 
-    wxTextCtrl* item14 = new wxTextCtrl(item9, ID_WXWIN_HIERARCHY, _(""), wxDefaultPosition, wxSize(200, -1), 0);
-    item13->Add(item14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxTextCtrl* item16 = new wxTextCtrl(item11, ID_WXWIN_HIERARCHY, _(""), wxDefaultPosition, wxSize(200, -1), 0);
+    item16->SetHelpText(_("Enter the root path of the wxWindows hierarchy"));
+    if (ShowToolTips())
+        item16->SetToolTip(_("Enter the root path of the wxWindows hierarchy"));
+    item15->Add(item16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
-    wxButton* item15 = new wxButton(item9, ID_CHOOSE_WXWIN_HIERARCHY, _("&Choose..."), wxDefaultPosition, wxDefaultSize, 0);
-    item13->Add(item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxButton* item17 = new wxButton(item11, ID_CHOOSE_WXWIN_HIERARCHY, _("&Choose..."), wxDefaultPosition, wxDefaultSize, 0);
+    item17->SetHelpText(_("Click to choose the root path of the wxWindows hierarchy\\n"));
+    if (ShowToolTips())
+        item17->SetToolTip(_("Click to choose the root path of the wxWindows hierarchy\\n"));
+    item15->Add(item17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
-    wxBoxSizer* item16 = new wxBoxSizer(wxHORIZONTAL);
-    item11->Add(item16, 0, wxGROW, 5);
+    wxBoxSizer* item18 = new wxBoxSizer(wxHORIZONTAL);
+    item13->Add(item18, 0, wxGROW, 5);
 
 
-    item16->Add(60, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    item18->Add(60, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
-    wxCheckBox* item18 = new wxCheckBox(item9, ID_USE_WXWIN, _("&Use WXWIN environment variable"), wxDefaultPosition, wxDefaultSize, 0);
-    item18->SetValue(FALSE);
-    item16->Add(item18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxCheckBox* item20 = new wxCheckBox(item11, ID_USE_WXWIN, _("&Use WXWIN environment variable"), wxDefaultPosition, wxDefaultSize, 0);
+    item20->SetValue(FALSE);
+    item20->SetHelpText(_("Check to use the value of WXWIN instead"));
+    if (ShowToolTips())
+        item20->SetToolTip(_("Check to use the value of WXWIN instead"));
+    item18->Add(item20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     GetSizer()->Fit(this);
 ////@end ctLocationSettingsDialog content construction
 
     GetSizer()->Fit(this);
 ////@end ctLocationSettingsDialog content construction
diff --git a/utils/configtool/src/settingsdialog.h b/utils/configtool/src/settingsdialog.h
index bee8b64381fb3610142a2d36bfe3e1d0375e1a42..43939248deb3a83529a57dbd36d9dbbea8354f1e 100644 (file)
--- a/utils/configtool/src/settingsdialog.h
+++ b/utils/configtool/src/settingsdialog.h
@@ -42,6 +42,7 @@ class ctLocationSettingsDialog;
 #define ID_GENERAL_SETTINGS_DIALOG 10005
 #define ID_LOAD_LAST_DOCUMENT 10006
 #define ID_SHOW_TOOLTIPS 10007
 #define ID_GENERAL_SETTINGS_DIALOG 10005
 #define ID_LOAD_LAST_DOCUMENT 10006
 #define ID_SHOW_TOOLTIPS 10007
+#define ID_DEFAULT_FILE_KIND 10003
 #define ID_LOCATION_SETTINGS_DIALOG 10008
 #define ID_WXWIN_HIERARCHY 10010
 #define ID_CHOOSE_WXWIN_HIERARCHY 10011
 #define ID_LOCATION_SETTINGS_DIALOG 10008
 #define ID_WXWIN_HIERARCHY 10010
 #define ID_CHOOSE_WXWIN_HIERARCHY 10011
diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index 72ed69e763f5ac97224cbb999de9864bee538bdd..a88f72962a2b3859141d0413e5ccacbe3295e8a9 100644 (file)
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -136,6 +136,7 @@ DECLARE_APP(ctApp)
 // File menu ids
 #define ctID_SAVE_SETUP_FILE                1001
 #define ctID_SAVE_CONFIGURE_COMMAND         1002
 // File menu ids
 #define ctID_SAVE_SETUP_FILE                1001
 #define ctID_SAVE_CONFIGURE_COMMAND         1002
+#define ctID_GO                             1003
 
 // Edit menu ids
 #define ctID_ADD_ITEM                       1030
 
 // Edit menu ids
 #define ctID_ADD_ITEM                       1030
diff --git a/utils/configtool/src/wxconfigtool.pjd b/utils/configtool/src/wxconfigtool.pjd
index 10e27d572a62f02182b8e4948f96f0dba6385fd4..d647bb5e4bc0c8928f374b2d30344738eeeab96b 100644 (file)
--- a/utils/configtool/src/wxconfigtool.pjd
+++ b/utils/configtool/src/wxconfigtool.pjd
@@ -12,7 +12,7 @@
        <value name="title" type="string"></value>
        <value name="author" type="string"></value>
        <value name="description" type="string"></value>
        <value name="title" type="string"></value>
        <value name="author" type="string"></value>
        <value name="description" type="string"></value>
-       <value name="doc_count" type="Integer">68</value>
+       <value name="doc_count" type="Integer">70</value>
        <value name="xrc_filename" type="string"></value>
        <value name="convert_images_to_xpm" type="bool">TRUE</value>
        <value name="inline_images" type="bool">FALSE</value>
        <value name="xrc_filename" type="string"></value>
        <value name="convert_images_to_xpm" type="bool">TRUE</value>
        <value name="inline_images" type="bool">FALSE</value>
@@ -23,35 +23,36 @@
        <value name="user_name" type="string"></value>
        <value name="copyright_string" type="string"></value>
        <value name="resource_prefix" type="string"></value>
        <value name="user_name" type="string"></value>
        <value name="copyright_string" type="string"></value>
        <value name="resource_prefix" type="string"></value>
-       <path name="IDb39808">
+       <path name="IDb988f8">
                <value name="title" type="string">Projects</value>
                <value name="title" type="string">Projects</value>
-               <value name="id" type="Integer">11769864</value>
+               <value name="id" type="Integer">12159224</value>
                <value name="type" type="string">root-document</value>
                <value name="filename" type="string"></value>
                <value name="icon-name" type="string">project</value>
                <value name="is-transient" type="Integer">1</value>
                <value name="parent" type="Integer">0</value>
                <value name="locked" type="Integer">0</value>
                <value name="type" type="string">root-document</value>
                <value name="filename" type="string"></value>
                <value name="icon-name" type="string">project</value>
                <value name="is-transient" type="Integer">1</value>
                <value name="parent" type="Integer">0</value>
                <value name="locked" type="Integer">0</value>
-               <path name="IDb56d98">
+               <path name="IDb47b58">
                        <value name="title" type="string">Dialogs</value>
                        <value name="title" type="string">Dialogs</value>
-                       <value name="id" type="Integer">11890072</value>
+                       <value name="id" type="Integer">11828056</value>
                        <value name="type" type="string">html-document</value>
                        <value name="filename" type="string"></value>
                        <value name="icon-name" type="string">dialogsfolder</value>
                        <value name="is-transient" type="Integer">1</value>
                        <value name="type" type="string">html-document</value>
                        <value name="filename" type="string"></value>
                        <value name="icon-name" type="string">dialogsfolder</value>
                        <value name="is-transient" type="Integer">1</value>
-                       <value name="parent" type="Integer">11769864</value>
+                       <value name="parent" type="Integer">12159224</value>
                        <value name="locked" type="Integer">1</value>
                        <value name="locked" type="Integer">1</value>
-                       <path name="IDb540b8">
+                       <path name="IDb501e0">
                                <value name="title" type="string">Configuration Items Selector</value>
                                <value name="title" type="string">Configuration Items Selector</value>
-                               <value name="id" type="Integer">11878584</value>
+                               <value name="id" type="Integer">11862496</value>
                                <value name="type" type="string">dialog-document</value>
                                <value name="filename" type="string"></value>
                                <value name="icon-name" type="string">dialog</value>
                                <value name="is-transient" type="Integer">0</value>
                                <value name="type" type="string">dialog-document</value>
                                <value name="filename" type="string"></value>
                                <value name="icon-name" type="string">dialog</value>
                                <value name="is-transient" type="Integer">0</value>
-                               <value name="parent" type="Integer">11890072</value>
+                               <value name="parent" type="Integer">11828056</value>
                                <value name="locked" type="Integer">0</value>
                                <value name="created" type="string">5/5/2003</value>
                                <value name="proxy-type" type="string">wbDialogProxy</value>
                                <value name="locked" type="Integer">0</value>
                                <value name="created" type="string">5/5/2003</value>
                                <value name="proxy-type" type="string">wbDialogProxy</value>
+                               <value name="base-id" type="Integer">10000</value>
                                <value name="proxy-Id name" type="string">ID_DIALOG</value>
                                <value name="proxy-Id value" type="Integer">10000</value>
                                <value name="proxy-Class" type="string">ctConfigItemsSelector</value>
                                <value name="proxy-Id name" type="string">ID_DIALOG</value>
                                <value name="proxy-Id value" type="Integer">10000</value>
                                <value name="proxy-Class" type="string">ctConfigItemsSelector</value>
@@ -77,33 +78,43 @@
                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                               <value name="proxy-Background" type="string"></value>
-                               <value name="proxy-Foreground" type="string"></value>
+                               <value name="proxy-Background colour" type="string"></value>
+                               <value name="proxy-Foreground colour" type="string"></value>
                                <value name="proxy-Help text" type="string"></value>
                                <value name="proxy-Fit to content" type="bool">TRUE</value>
                                <value name="proxy-Width" type="Integer">400</value>
                                <value name="proxy-Height" type="Integer">300</value>
                                <value name="proxy-Help text" type="string"></value>
                                <value name="proxy-Fit to content" type="bool">TRUE</value>
                                <value name="proxy-Width" type="Integer">400</value>
                                <value name="proxy-Height" type="Integer">300</value>
-                               <path name="IDb39308">
+                               <value name="proxy-Background" type="string"></value>
+                               <value name="proxy-Foreground" type="string"></value>
+                               <path name="IDb4d3f0">
                                        <value name="title" type="string">wxBoxSizer V</value>
                                        <value name="title" type="string">wxBoxSizer V</value>
-                                       <value name="id" type="Integer">11768584</value>
+                                       <value name="id" type="Integer">11850736</value>
                                        <value name="type" type="string">dialog-control-document</value>
                                        <value name="filename" type="string"></value>
                                        <value name="icon-name" type="string">sizer</value>
                                        <value name="is-transient" type="Integer">0</value>
                                        <value name="type" type="string">dialog-control-document</value>
                                        <value name="filename" type="string"></value>
                                        <value name="icon-name" type="string">sizer</value>
                                        <value name="is-transient" type="Integer">0</value>
-                                       <value name="parent" type="Integer">11878584</value>
+                                       <value name="parent" type="Integer">11862496</value>
                                        <value name="locked" type="Integer">0</value>
                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                        <value name="locked" type="Integer">0</value>
                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                        <value name="proxy-Orientation" type="string">Vertical</value>
+                                       <value name="proxy-AlignH" type="string">Centre</value>
+                                       <value name="proxy-AlignV" type="string">Centre</value>
+                                       <value name="proxy-Stretch factor" type="Integer">0</value>
+                                       <value name="proxy-Border" type="Integer">5</value>
+                                       <value name="proxy-wxLEFT" type="bool">TRUE</value>
+                                       <value name="proxy-wxRIGHT" type="bool">TRUE</value>
+                                       <value name="proxy-wxTOP" type="bool">TRUE</value>
+                                       <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                       <path name="IDb7e4d0">
+                                       <path name="IDb4d968">
                                                <value name="title" type="string">wxBoxSizer V</value>
                                                <value name="title" type="string">wxBoxSizer V</value>
-                                               <value name="id" type="Integer">12051664</value>
+                                               <value name="id" type="Integer">11852136</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">sizer</value>
                                                <value name="is-transient" type="Integer">0</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">sizer</value>
                                                <value name="is-transient" type="Integer">0</value>
-                                               <value name="parent" type="Integer">11768584</value>
+                                               <value name="parent" type="Integer">11850736</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -117,21 +128,23 @@
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                               <path name="IDb7eab8">
+                                               <path name="IDba39d8">
                                                        <value name="title" type="string">wxStaticText</value>
                                                        <value name="title" type="string">wxStaticText</value>
-                                                       <value name="id" type="Integer">12053176</value>
+                                                       <value name="id" type="Integer">12204504</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">12051664</value>
+                                                       <value name="parent" type="Integer">11852136</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Label" type="string">Please edit the list of configuration items by selecting from the
 list below.</value>
                                                        <value name="proxy-Label" type="string">Please edit the list of configuration items by selecting from the
 list below.</value>
+                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -145,8 +158,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -161,21 +174,25 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDb77de8">
+                                               <path name="IDb95180">
                                                        <value name="title" type="string">wxStaticText</value>
                                                        <value name="title" type="string">wxStaticText</value>
-                                                       <value name="id" type="Integer">12025320</value>
+                                                       <value name="id" type="Integer">12145024</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">12051664</value>
+                                                       <value name="parent" type="Integer">11852136</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Label" type="string">&amp;Available items:</value>
                                                        <value name="proxy-Label" type="string">&amp;Available items:</value>
+                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -189,8 +206,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -205,20 +222,23 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDbafc68">
+                                               <path name="IDb600d8">
                                                        <value name="title" type="string">wxListBox</value>
                                                        <value name="title" type="string">wxListBox</value>
-                                                       <value name="id" type="Integer">12254312</value>
+                                                       <value name="id" type="Integer">11927768</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">12051664</value>
+                                                       <value name="parent" type="Integer">11852136</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbListBoxProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_AVAILABLE_CONFIG_ITEMS</value>
                                                        <value name="proxy-Id value" type="Integer">10002</value>
                                                        <value name="proxy-Class" type="string">wxListBox</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbListBoxProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_AVAILABLE_CONFIG_ITEMS</value>
                                                        <value name="proxy-Id value" type="Integer">10002</value>
                                                        <value name="proxy-Class" type="string">wxListBox</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Strings" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Strings" type="string"></value>
@@ -239,8 +259,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -257,21 +277,25 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDb60b10">
+                                               <path name="IDbebdc0">
                                                        <value name="title" type="string">wxStaticText</value>
                                                        <value name="title" type="string">wxStaticText</value>
-                                                       <value name="id" type="Integer">11930384</value>
+                                                       <value name="id" type="Integer">12500416</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">12051664</value>
+                                                       <value name="parent" type="Integer">11852136</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Label" type="string">&amp;List of configuration items:</value>
                                                        <value name="proxy-Label" type="string">&amp;List of configuration items:</value>
+                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -285,8 +309,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -301,15 +325,17 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDb58838">
+                                               <path name="IDb9f1e8">
                                                        <value name="title" type="string">wxBoxSizer H</value>
                                                        <value name="title" type="string">wxBoxSizer H</value>
-                                                       <value name="id" type="Integer">11896888</value>
+                                                       <value name="id" type="Integer">12186088</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">12051664</value>
+                                                       <value name="parent" type="Integer">11852136</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -323,19 +349,20 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <path name="IDb40868">
+                                                       <path name="IDb61140">
                                                                <value name="title" type="string">wxListBox</value>
                                                                <value name="title" type="string">wxListBox</value>
-                                                               <value name="id" type="Integer">11798632</value>
+                                                               <value name="id" type="Integer">11931968</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">11896888</value>
+                                                               <value name="parent" type="Integer">12186088</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbListBoxProxy</value>
                                                                <value name="proxy-Id name" type="string">ID_CONFIG_ITEMS</value>
                                                                <value name="proxy-Id value" type="Integer">10005</value>
                                                                <value name="proxy-Class" type="string">wxListBox</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbListBoxProxy</value>
                                                                <value name="proxy-Id name" type="string">ID_CONFIG_ITEMS</value>
                                                                <value name="proxy-Id value" type="Integer">10005</value>
                                                                <value name="proxy-Class" type="string">wxListBox</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Strings" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Strings" type="string"></value>
@@ -356,8 +383,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -374,15 +401,17 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                        </path>
-                                                       <path name="IDbb2740">
+                                                       <path name="IDb47518">
                                                                <value name="title" type="string">wxBoxSizer V</value>
                                                                <value name="title" type="string">wxBoxSizer V</value>
-                                                               <value name="id" type="Integer">12265280</value>
+                                                               <value name="id" type="Integer">11826456</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">11896888</value>
+                                                               <value name="parent" type="Integer">12186088</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -396,19 +425,20 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                               <path name="IDb74768">
+                                                               <path name="IDbf20c0">
                                                                        <value name="title" type="string">wxButton</value>
                                                                        <value name="title" type="string">wxButton</value>
-                                                                       <value name="id" type="Integer">12011368</value>
+                                                                       <value name="id" type="Integer">12525760</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">12265280</value>
+                                                                       <value name="parent" type="Integer">11826456</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CONFIG_ADD</value>
                                                                        <value name="proxy-Id value" type="Integer">10006</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CONFIG_ADD</value>
                                                                        <value name="proxy-Id value" type="Integer">10006</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">A&amp;dd</value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">A&amp;dd</value>
@@ -421,8 +451,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -439,20 +469,23 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                                </path>
-                                                               <path name="IDe27bc0">
+                                                               <path name="IDb601e0">
                                                                        <value name="title" type="string">wxButton</value>
                                                                        <value name="title" type="string">wxButton</value>
-                                                                       <value name="id" type="Integer">14842816</value>
+                                                                       <value name="id" type="Integer">11928032</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">12265280</value>
+                                                                       <value name="parent" type="Integer">11826456</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CONFIG_REMOVE</value>
                                                                        <value name="proxy-Id value" type="Integer">10007</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CONFIG_REMOVE</value>
                                                                        <value name="proxy-Id value" type="Integer">10007</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">&amp;Remove</value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">&amp;Remove</value>
@@ -465,8 +498,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -483,17 +516,19 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                        </path>
                                                </path>
                                                                </path>
                                                        </path>
                                                </path>
-                                               <path name="IDb653d8">
+                                               <path name="IDba3780">
                                                        <value name="title" type="string">wxBoxSizer H</value>
                                                        <value name="title" type="string">wxBoxSizer H</value>
-                                                       <value name="id" type="Integer">11949016</value>
+                                                       <value name="id" type="Integer">12203904</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">12051664</value>
+                                                       <value name="parent" type="Integer">11852136</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -507,14 +542,14 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <path name="IDb64740">
+                                                       <path name="IDb8f888">
                                                                <value name="title" type="string">Spacer</value>
                                                                <value name="title" type="string">Spacer</value>
-                                                               <value name="id" type="Integer">11945792</value>
+                                                               <value name="id" type="Integer">12122248</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">11949016</value>
+                                                               <value name="parent" type="Integer">12203904</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                                <value name="proxy-Width" type="Integer">5</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                                <value name="proxy-Width" type="Integer">5</value>
@@ -530,19 +565,20 @@ list below.</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        </path>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        </path>
-                                                       <path name="IDb5a510">
+                                                       <path name="IDb9d3f8">
                                                                <value name="title" type="string">wxButton</value>
                                                                <value name="title" type="string">wxButton</value>
-                                                               <value name="id" type="Integer">11904272</value>
+                                                               <value name="id" type="Integer">12178424</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">11949016</value>
+                                                               <value name="parent" type="Integer">12203904</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_OK</value>
                                                                <value name="proxy-Id value" type="Integer">5100</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_OK</value>
                                                                <value name="proxy-Id value" type="Integer">5100</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;OK</value>
                                                                <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;OK</value>
@@ -555,8 +591,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -573,20 +609,23 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                        </path>
-                                                       <path name="IDb73160">
+                                                       <path name="IDbfb688">
                                                                <value name="title" type="string">wxButton</value>
                                                                <value name="title" type="string">wxButton</value>
-                                                               <value name="id" type="Integer">12005728</value>
+                                                               <value name="id" type="Integer">12564104</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">11949016</value>
+                                                               <value name="parent" type="Integer">12203904</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_CANCEL</value>
                                                                <value name="proxy-Id value" type="Integer">5101</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_CANCEL</value>
                                                                <value name="proxy-Id value" type="Integer">5101</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;Cancel</value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;Cancel</value>
@@ -599,8 +638,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -617,22 +656,25 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                </path>
                                        </path>
                                </path>
                        </path>
                                                        </path>
                                                </path>
                                        </path>
                                </path>
                        </path>
-                       <path name="IDb3afe8">
+                       <path name="IDb9b008">
                                <value name="title" type="string">Edit Custom Property</value>
                                <value name="title" type="string">Edit Custom Property</value>
-                               <value name="id" type="Integer">11775976</value>
+                               <value name="id" type="Integer">12169224</value>
                                <value name="type" type="string">dialog-document</value>
                                <value name="filename" type="string"></value>
                                <value name="icon-name" type="string">dialog</value>
                                <value name="is-transient" type="Integer">0</value>
                                <value name="type" type="string">dialog-document</value>
                                <value name="filename" type="string"></value>
                                <value name="icon-name" type="string">dialog</value>
                                <value name="is-transient" type="Integer">0</value>
-                               <value name="parent" type="Integer">11890072</value>
+                               <value name="parent" type="Integer">11828056</value>
                                <value name="locked" type="Integer">0</value>
                                <value name="created" type="string">9/5/2003</value>
                                <value name="proxy-type" type="string">wbDialogProxy</value>
                                <value name="locked" type="Integer">0</value>
                                <value name="created" type="string">9/5/2003</value>
                                <value name="proxy-type" type="string">wbDialogProxy</value>
+                               <value name="base-id" type="Integer">10000</value>
                                <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYDIALOG</value>
                                <value name="proxy-Id value" type="Integer">10000</value>
                                <value name="proxy-Class" type="string">ctCustomPropertyDialog</value>
                                <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYDIALOG</value>
                                <value name="proxy-Id value" type="Integer">10000</value>
                                <value name="proxy-Class" type="string">ctCustomPropertyDialog</value>
@@ -658,20 +700,22 @@ list below.</value>
                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                               <value name="proxy-Background" type="string"></value>
-                               <value name="proxy-Foreground" type="string"></value>
+                               <value name="proxy-Background colour" type="string"></value>
+                               <value name="proxy-Foreground colour" type="string"></value>
                                <value name="proxy-Help text" type="string"></value>
                                <value name="proxy-Fit to content" type="bool">TRUE</value>
                                <value name="proxy-Width" type="Integer">400</value>
                                <value name="proxy-Height" type="Integer">300</value>
                                <value name="proxy-Help text" type="string"></value>
                                <value name="proxy-Fit to content" type="bool">TRUE</value>
                                <value name="proxy-Width" type="Integer">400</value>
                                <value name="proxy-Height" type="Integer">300</value>
-                               <path name="IDb59750">
+                               <value name="proxy-Background" type="string"></value>
+                               <value name="proxy-Foreground" type="string"></value>
+                               <path name="IDb69f90">
                                        <value name="title" type="string">wxBoxSizer V</value>
                                        <value name="title" type="string">wxBoxSizer V</value>
-                                       <value name="id" type="Integer">11900752</value>
+                                       <value name="id" type="Integer">11968400</value>
                                        <value name="type" type="string">dialog-control-document</value>
                                        <value name="filename" type="string"></value>
                                        <value name="icon-name" type="string">sizer</value>
                                        <value name="is-transient" type="Integer">0</value>
                                        <value name="type" type="string">dialog-control-document</value>
                                        <value name="filename" type="string"></value>
                                        <value name="icon-name" type="string">sizer</value>
                                        <value name="is-transient" type="Integer">0</value>
-                                       <value name="parent" type="Integer">11775976</value>
+                                       <value name="parent" type="Integer">12169224</value>
                                        <value name="locked" type="Integer">0</value>
                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                        <value name="locked" type="Integer">0</value>
                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                        <value name="proxy-Orientation" type="string">Vertical</value>
@@ -685,14 +729,14 @@ list below.</value>
                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                       <path name="IDb5dd10">
+                                       <path name="IDb95770">
                                                <value name="title" type="string">wxBoxSizer V</value>
                                                <value name="title" type="string">wxBoxSizer V</value>
-                                               <value name="id" type="Integer">11918608</value>
+                                               <value name="id" type="Integer">12146544</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">sizer</value>
                                                <value name="is-transient" type="Integer">0</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">sizer</value>
                                                <value name="is-transient" type="Integer">0</value>
-                                               <value name="parent" type="Integer">11900752</value>
+                                               <value name="parent" type="Integer">11968400</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -706,20 +750,22 @@ list below.</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                               <path name="IDb687b0">
+                                               <path name="IDb9bd80">
                                                        <value name="title" type="string">wxStaticText</value>
                                                        <value name="title" type="string">wxStaticText</value>
-                                                       <value name="id" type="Integer">11962288</value>
+                                                       <value name="id" type="Integer">12172672</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Label" type="string">&amp;Enter name, type and description for your custom property.</value>
                                                        <value name="proxy-Label" type="string">&amp;Enter name, type and description for your custom property.</value>
+                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -733,8 +779,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -749,21 +795,25 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDb72010">
+                                               <path name="IDb51828">
                                                        <value name="title" type="string">wxStaticText</value>
                                                        <value name="title" type="string">wxStaticText</value>
-                                                       <value name="id" type="Integer">12001296</value>
+                                                       <value name="id" type="Integer">11868200</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Label" type="string">&amp;Name:</value>
                                                        <value name="proxy-Label" type="string">&amp;Name:</value>
+                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -777,8 +827,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -793,20 +843,23 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDb5c268">
+                                               <path name="IDb84540">
                                                        <value name="title" type="string">wxTextCtrl</value>
                                                        <value name="title" type="string">wxTextCtrl</value>
-                                                       <value name="id" type="Integer">11911784</value>
+                                                       <value name="id" type="Integer">12076352</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbTextCtrlProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYNAME</value>
                                                        <value name="proxy-Id value" type="Integer">10003</value>
                                                        <value name="proxy-Class" type="string">wxTextCtrl</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbTextCtrlProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYNAME</value>
                                                        <value name="proxy-Id value" type="Integer">10003</value>
                                                        <value name="proxy-Class" type="string">wxTextCtrl</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Initial value" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Initial value" type="string"></value>
@@ -834,8 +887,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -852,15 +905,17 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDdf3eb8">
+                                               <path name="IDb52ef8">
                                                        <value name="title" type="string">wxBoxSizer H</value>
                                                        <value name="title" type="string">wxBoxSizer H</value>
-                                                       <value name="id" type="Integer">14630584</value>
+                                                       <value name="id" type="Integer">11874040</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -874,14 +929,14 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <path name="IDb8dfd0">
+                                                       <path name="IDbf8268">
                                                                <value name="title" type="string">wxBoxSizer V</value>
                                                                <value name="title" type="string">wxBoxSizer V</value>
-                                                               <value name="id" type="Integer">12115920</value>
+                                                               <value name="id" type="Integer">12550760</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14630584</value>
+                                                               <value name="parent" type="Integer">11874040</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -895,20 +950,22 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                               <path name="IDb8f6b8">
+                                                               <path name="IDbf9e08">
                                                                        <value name="title" type="string">wxStaticText</value>
                                                                        <value name="title" type="string">wxStaticText</value>
-                                                                       <value name="id" type="Integer">12121784</value>
+                                                                       <value name="id" type="Integer">12557832</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">12115920</value>
+                                                                       <value name="parent" type="Integer">12550760</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Label" type="string">&amp;Data type:</value>
                                                                        <value name="proxy-Label" type="string">&amp;Data type:</value>
+                                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -922,8 +979,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -938,20 +995,23 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                                </path>
-                                                               <path name="IDb92090">
+                                                               <path name="IDbaedd0">
                                                                        <value name="title" type="string">wxChoice</value>
                                                                        <value name="title" type="string">wxChoice</value>
-                                                                       <value name="id" type="Integer">12132496</value>
+                                                                       <value name="id" type="Integer">12250576</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">12115920</value>
+                                                                       <value name="parent" type="Integer">12550760</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbChoiceProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYTYPE</value>
                                                                        <value name="proxy-Id value" type="Integer">10002</value>
                                                                        <value name="proxy-Class" type="string">wxChoice</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbChoiceProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYTYPE</value>
                                                                        <value name="proxy-Id value" type="Integer">10002</value>
                                                                        <value name="proxy-Class" type="string">wxChoice</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Strings" type="string">string|bool|double|long</value>
                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Strings" type="string">string|bool|double|long</value>
@@ -959,8 +1019,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -977,16 +1037,18 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                        </path>
                                                                </path>
                                                        </path>
-                                                       <path name="IDe28008">
+                                                       <path name="IDe4c008">
                                                                <value name="title" type="string">wxBoxSizer V</value>
                                                                <value name="title" type="string">wxBoxSizer V</value>
-                                                               <value name="id" type="Integer">14843912</value>
+                                                               <value name="id" type="Integer">14991368</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14630584</value>
+                                                               <value name="parent" type="Integer">11874040</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -1000,20 +1062,22 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                               <path name="IDe29100">
+                                                               <path name="IDe4cfa0">
                                                                        <value name="title" type="string">wxStaticText</value>
                                                                        <value name="title" type="string">wxStaticText</value>
-                                                                       <value name="id" type="Integer">14848256</value>
+                                                                       <value name="id" type="Integer">14995360</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">14843912</value>
+                                                                       <value name="parent" type="Integer">14991368</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                                        <value name="proxy-Id value" type="Integer">10007</value>
                                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                                        <value name="proxy-Id value" type="Integer">10007</value>
                                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Label" type="string">&amp;Editor type:</value>
                                                                        <value name="proxy-Label" type="string">&amp;Editor type:</value>
+                                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -1027,8 +1091,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -1043,20 +1107,23 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                                </path>
-                                                               <path name="IDe2baa0">
+                                                               <path name="IDe50078">
                                                                        <value name="title" type="string">wxChoice</value>
                                                                        <value name="title" type="string">wxChoice</value>
-                                                                       <value name="id" type="Integer">14858912</value>
+                                                                       <value name="id" type="Integer">15007864</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">14843912</value>
+                                                                       <value name="parent" type="Integer">14991368</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbChoiceProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYEDITORTYPE</value>
                                                                        <value name="proxy-Id value" type="Integer">10008</value>
                                                                        <value name="proxy-Class" type="string">wxChoice</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbChoiceProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYEDITORTYPE</value>
                                                                        <value name="proxy-Id value" type="Integer">10008</value>
                                                                        <value name="proxy-Class" type="string">wxChoice</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Strings" type="string">string|choice|bool|float|integer|configitems</value>
                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                        <value name="proxy-Strings" type="string">string|choice|bool|float|integer|configitems</value>
@@ -1064,8 +1131,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -1082,20 +1149,23 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                        </path>
                                                </path>
                                                                </path>
                                                        </path>
                                                </path>
-                                               <path name="IDe2dc68">
+                                               <path name="IDe52538">
                                                        <value name="title" type="string">wxStaticBoxSizer H</value>
                                                        <value name="title" type="string">wxStaticBoxSizer H</value>
-                                                       <value name="id" type="Integer">14867560</value>
+                                                       <value name="id" type="Integer">15017272</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticBoxSizerProxy</value>
                                                        <value name="proxy-Label" type="string">Choices</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticBoxSizerProxy</value>
                                                        <value name="proxy-Label" type="string">Choices</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
                                                        <value name="proxy-AlignH" type="string">Expand</value>
                                                        <value name="proxy-AlignV" type="string">Centre</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
                                                        <value name="proxy-AlignH" type="string">Expand</value>
                                                        <value name="proxy-AlignV" type="string">Centre</value>
@@ -1107,19 +1177,20 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <path name="IDe2ec40">
+                                                       <path name="IDe53678">
                                                                <value name="title" type="string">wxListBox</value>
                                                                <value name="title" type="string">wxListBox</value>
-                                                               <value name="id" type="Integer">14871616</value>
+                                                               <value name="id" type="Integer">15021688</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14867560</value>
+                                                               <value name="parent" type="Integer">15017272</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbListBoxProxy</value>
                                                                <value name="proxy-Id name" type="string">ID_PROPERTY_CHOICES</value>
                                                                <value name="proxy-Id value" type="Integer">10001</value>
                                                                <value name="proxy-Class" type="string">wxListBox</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbListBoxProxy</value>
                                                                <value name="proxy-Id name" type="string">ID_PROPERTY_CHOICES</value>
                                                                <value name="proxy-Id value" type="Integer">10001</value>
                                                                <value name="proxy-Class" type="string">wxListBox</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                <value name="proxy-Strings" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                <value name="proxy-Strings" type="string"></value>
@@ -1140,8 +1211,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -1158,15 +1229,17 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                        </path>
-                                                       <path name="IDe31f08">
+                                                       <path name="IDe56cc0">
                                                                <value name="title" type="string">wxBoxSizer V</value>
                                                                <value name="title" type="string">wxBoxSizer V</value>
-                                                               <value name="id" type="Integer">14884616</value>
+                                                               <value name="id" type="Integer">15035584</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14867560</value>
+                                                               <value name="parent" type="Integer">15017272</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -1180,19 +1253,20 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                               <path name="IDe33298">
+                                                               <path name="IDe57d48">
                                                                        <value name="title" type="string">wxButton</value>
                                                                        <value name="title" type="string">wxButton</value>
-                                                                       <value name="id" type="Integer">14889624</value>
+                                                                       <value name="id" type="Integer">15039816</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">14884616</value>
+                                                                       <value name="parent" type="Integer">15035584</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_PROPERTY_CHOICE_ADD</value>
                                                                        <value name="proxy-Id value" type="Integer">10005</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_PROPERTY_CHOICE_ADD</value>
                                                                        <value name="proxy-Id value" type="Integer">10005</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">&amp;Add...</value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">&amp;Add...</value>
@@ -1205,8 +1279,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -1223,20 +1297,23 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                                </path>
-                                                               <path name="IDe35c08">
+                                                               <path name="IDe5ac58">
                                                                        <value name="title" type="string">wxButton</value>
                                                                        <value name="title" type="string">wxButton</value>
-                                                                       <value name="id" type="Integer">14900232</value>
+                                                                       <value name="id" type="Integer">15051864</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">14884616</value>
+                                                                       <value name="parent" type="Integer">15035584</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_PROPERTY_CHOICE_REMOVE</value>
                                                                        <value name="proxy-Id value" type="Integer">10006</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                        <value name="proxy-Id name" type="string">ID_PROPERTY_CHOICE_REMOVE</value>
                                                                        <value name="proxy-Id value" type="Integer">10006</value>
                                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">&amp;Remove</value>
                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                        <value name="proxy-Label" type="string">&amp;Remove</value>
@@ -1249,8 +1326,8 @@ list below.</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                       <value name="proxy-Background" type="string"></value>
-                                                                       <value name="proxy-Foreground" type="string"></value>
+                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                        <value name="proxy-Help text" type="string"></value>
                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -1267,23 +1344,27 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       <value name="proxy-Background" type="string"></value>
+                                                                       <value name="proxy-Foreground" type="string"></value>
                                                                </path>
                                                        </path>
                                                </path>
                                                                </path>
                                                        </path>
                                                </path>
-                                               <path name="IDe38538">
+                                               <path name="IDb847b8">
                                                        <value name="title" type="string">wxStaticText</value>
                                                        <value name="title" type="string">wxStaticText</value>
-                                                       <value name="id" type="Integer">14910776</value>
+                                                       <value name="id" type="Integer">12076984</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                        <value name="proxy-Id value" type="Integer">5105</value>
                                                        <value name="proxy-Class" type="string">wxStaticText</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Label" type="string">&amp;Description:</value>
                                                        <value name="proxy-Label" type="string">&amp;Description:</value>
+                                                       <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                        <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -1297,8 +1378,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">-1</value>
@@ -1313,20 +1394,23 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDe3ac60">
+                                               <path name="IDe60140">
                                                        <value name="title" type="string">wxTextCtrl</value>
                                                        <value name="title" type="string">wxTextCtrl</value>
-                                                       <value name="id" type="Integer">14920800</value>
+                                                       <value name="id" type="Integer">15073600</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbTextCtrlProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYDESCRIPTION</value>
                                                        <value name="proxy-Id value" type="Integer">10004</value>
                                                        <value name="proxy-Class" type="string">wxTextCtrl</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbTextCtrlProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_CUSTOMPROPERTYDESCRIPTION</value>
                                                        <value name="proxy-Id value" type="Integer">10004</value>
                                                        <value name="proxy-Class" type="string">wxTextCtrl</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Initial value" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Initial value" type="string"></value>
@@ -1354,8 +1438,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -1372,15 +1456,17 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDe3e950">
+                                               <path name="IDe640c8">
                                                        <value name="title" type="string">wxBoxSizer H</value>
                                                        <value name="title" type="string">wxBoxSizer H</value>
-                                                       <value name="id" type="Integer">14936400</value>
+                                                       <value name="id" type="Integer">15089864</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">sizer</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11918608</value>
+                                                       <value name="parent" type="Integer">12146544</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                        <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -1394,14 +1480,14 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <path name="IDe3f960">
+                                                       <path name="IDe65128">
                                                                <value name="title" type="string">Spacer</value>
                                                                <value name="title" type="string">Spacer</value>
-                                                               <value name="id" type="Integer">14940512</value>
+                                                               <value name="id" type="Integer">15094056</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14936400</value>
+                                                               <value name="parent" type="Integer">15089864</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                                <value name="proxy-Width" type="Integer">5</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                                <value name="proxy-Width" type="Integer">5</value>
@@ -1417,19 +1503,20 @@ list below.</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        </path>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        </path>
-                                                       <path name="IDe40bc0">
+                                                       <path name="IDe660a8">
                                                                <value name="title" type="string">wxButton</value>
                                                                <value name="title" type="string">wxButton</value>
-                                                               <value name="id" type="Integer">14945216</value>
+                                                               <value name="id" type="Integer">15098024</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14936400</value>
+                                                               <value name="parent" type="Integer">15089864</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_OK</value>
                                                                <value name="proxy-Id value" type="Integer">5100</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_OK</value>
                                                                <value name="proxy-Id value" type="Integer">5100</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;OK</value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;OK</value>
@@ -1442,8 +1529,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -1460,20 +1547,23 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                        </path>
-                                                       <path name="IDe434b8">
+                                                       <path name="IDe68f38">
                                                                <value name="title" type="string">wxButton</value>
                                                                <value name="title" type="string">wxButton</value>
-                                                               <value name="id" type="Integer">14955704</value>
+                                                               <value name="id" type="Integer">15109944</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14936400</value>
+                                                               <value name="parent" type="Integer">15089864</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_CANCEL</value>
                                                                <value name="proxy-Id value" type="Integer">5101</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_CANCEL</value>
                                                                <value name="proxy-Id value" type="Integer">5101</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;Cancel</value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;Cancel</value>
@@ -1486,8 +1576,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -1504,20 +1594,23 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                        </path>
-                                                       <path name="IDe45d90">
+                                                       <path name="IDe6bb00">
                                                                <value name="title" type="string">wxButton</value>
                                                                <value name="title" type="string">wxButton</value>
-                                                               <value name="id" type="Integer">14966160</value>
+                                                               <value name="id" type="Integer">15121152</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">14936400</value>
+                                                               <value name="parent" type="Integer">15089864</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_HELP</value>
                                                                <value name="proxy-Id value" type="Integer">5009</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                <value name="proxy-Id name" type="string">wxID_HELP</value>
                                                                <value name="proxy-Id value" type="Integer">5009</value>
                                                                <value name="proxy-Class" type="string">wxButton</value>
+                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;Help</value>
                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                <value name="proxy-Label" type="string">&amp;Help</value>
@@ -1530,8 +1623,8 @@ list below.</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                               <value name="proxy-Background" type="string"></value>
-                                                               <value name="proxy-Foreground" type="string"></value>
+                                                               <value name="proxy-Background colour" type="string"></value>
+                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                <value name="proxy-Help text" type="string"></value>
                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                <value name="proxy-X" type="Integer">-1</value>
@@ -1548,22 +1641,25 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                               <value name="proxy-Background" type="string"></value>
+                                                               <value name="proxy-Foreground" type="string"></value>
                                                        </path>
                                                </path>
                                        </path>
                                </path>
                        </path>
                                                        </path>
                                                </path>
                                        </path>
                                </path>
                        </path>
-                       <path name="IDb6ef60">
+                       <path name="IDbfe3e0">
                                <value name="title" type="string">Settings Dialog</value>
                                <value name="title" type="string">Settings Dialog</value>
-                               <value name="id" type="Integer">11988832</value>
+                               <value name="id" type="Integer">12575712</value>
                                <value name="type" type="string">dialog-document</value>
                                <value name="filename" type="string"></value>
                                <value name="icon-name" type="string">dialog</value>
                                <value name="is-transient" type="Integer">0</value>
                                <value name="type" type="string">dialog-document</value>
                                <value name="filename" type="string"></value>
                                <value name="icon-name" type="string">dialog</value>
                                <value name="is-transient" type="Integer">0</value>
-                               <value name="parent" type="Integer">11890072</value>
+                               <value name="parent" type="Integer">11828056</value>
                                <value name="locked" type="Integer">0</value>
                                <value name="created" type="string">9/5/2003</value>
                                <value name="proxy-type" type="string">wbDialogProxy</value>
                                <value name="locked" type="Integer">0</value>
                                <value name="created" type="string">9/5/2003</value>
                                <value name="proxy-type" type="string">wbDialogProxy</value>
+                               <value name="base-id" type="Integer">10000</value>
                                <value name="proxy-Id name" type="string">ID_SETTINGS_DIALOG</value>
                                <value name="proxy-Id value" type="Integer">10000</value>
                                <value name="proxy-Class" type="string">ctSettingsDialog</value>
                                <value name="proxy-Id name" type="string">ID_SETTINGS_DIALOG</value>
                                <value name="proxy-Id value" type="Integer">10000</value>
                                <value name="proxy-Class" type="string">ctSettingsDialog</value>
@@ -1589,46 +1685,39 @@ list below.</value>
                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                               <value name="proxy-Background" type="string"></value>
-                               <value name="proxy-Foreground" type="string"></value>
+                               <value name="proxy-Background colour" type="string"></value>
+                               <value name="proxy-Foreground colour" type="string"></value>
                                <value name="proxy-Help text" type="string"></value>
                                <value name="proxy-Fit to content" type="bool">TRUE</value>
                                <value name="proxy-Width" type="Integer">400</value>
                                <value name="proxy-Height" type="Integer">300</value>
                                <value name="proxy-Help text" type="string"></value>
                                <value name="proxy-Fit to content" type="bool">TRUE</value>
                                <value name="proxy-Width" type="Integer">400</value>
                                <value name="proxy-Height" type="Integer">300</value>
-                               <path name="IDe4a5e8">
+                               <path name="IDe704a8">
                                        <value name="title" type="string">wxBoxSizer V</value>
                                        <value name="title" type="string">wxBoxSizer V</value>
-                                       <value name="id" type="Integer">14984680</value>
+                                       <value name="id" type="Integer">15140008</value>
                                        <value name="type" type="string">dialog-control-document</value>
                                        <value name="filename" type="string"></value>
                                        <value name="icon-name" type="string">sizer</value>
                                        <value name="is-transient" type="Integer">0</value>
                                        <value name="type" type="string">dialog-control-document</value>
                                        <value name="filename" type="string"></value>
                                        <value name="icon-name" type="string">sizer</value>
                                        <value name="is-transient" type="Integer">0</value>
-                                       <value name="parent" type="Integer">11988832</value>
+                                       <value name="parent" type="Integer">12575712</value>
                                        <value name="locked" type="Integer">0</value>
                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                        <value name="locked" type="Integer">0</value>
                                        <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                        <value name="proxy-Orientation" type="string">Vertical</value>
-                                       <value name="proxy-AlignH" type="string">Centre</value>
-                                       <value name="proxy-AlignV" type="string">Centre</value>
-                                       <value name="proxy-Stretch factor" type="Integer">0</value>
-                                       <value name="proxy-Border" type="Integer">5</value>
-                                       <value name="proxy-wxLEFT" type="bool">TRUE</value>
-                                       <value name="proxy-wxRIGHT" type="bool">TRUE</value>
-                                       <value name="proxy-wxTOP" type="bool">TRUE</value>
-                                       <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                       <path name="IDe4ba00">
+                                       <path name="IDe717b8">
                                                <value name="title" type="string">wxNotebook</value>
                                                <value name="title" type="string">wxNotebook</value>
-                                               <value name="id" type="Integer">14989824</value>
+                                               <value name="id" type="Integer">15144888</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                <value name="is-transient" type="Integer">0</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                <value name="is-transient" type="Integer">0</value>
-                                               <value name="parent" type="Integer">14984680</value>
+                                               <value name="parent" type="Integer">15140008</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbNotebookProxy</value>
                                                <value name="proxy-Id name" type="string">ID_NOTEBOOK</value>
                                                <value name="proxy-Id value" type="Integer">10001</value>
                                                <value name="proxy-Class" type="string">wxNotebook</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbNotebookProxy</value>
                                                <value name="proxy-Id name" type="string">ID_NOTEBOOK</value>
                                                <value name="proxy-Id value" type="Integer">10001</value>
                                                <value name="proxy-Class" type="string">wxNotebook</value>
+                                               <value name="proxy-Member variable name" type="string"></value>
                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                <value name="proxy-Notebook sizer" type="bool">TRUE</value>
                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                <value name="proxy-Notebook sizer" type="bool">TRUE</value>
@@ -1648,8 +1737,8 @@ list below.</value>
                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                               <value name="proxy-Background" type="string"></value>
-                                               <value name="proxy-Foreground" type="string"></value>
+                                               <value name="proxy-Background colour" type="string"></value>
+                                               <value name="proxy-Foreground colour" type="string"></value>
                                                <value name="proxy-Help text" type="string"></value>
                                                <value name="proxy-Tooltip text" type="string"></value>
                                                <value name="proxy-X" type="Integer">-1</value>
                                                <value name="proxy-Help text" type="string"></value>
                                                <value name="proxy-Tooltip text" type="string"></value>
                                                <value name="proxy-X" type="Integer">-1</value>
@@ -1666,20 +1755,21 @@ list below.</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                               <path name="IDe4f6e0">
+                                               <path name="IDe757d8">
                                                        <value name="title" type="string">wxPanel</value>
                                                        <value name="title" type="string">wxPanel</value>
-                                                       <value name="id" type="Integer">15005408</value>
+                                                       <value name="id" type="Integer">15161304</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">14989824</value>
+                                                       <value name="parent" type="Integer">15144888</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbPanelProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_GENERAL_SETTINGS_DIALOG</value>
                                                        <value name="proxy-Id value" type="Integer">10005</value>
                                                        <value name="proxy-Class" type="string">ctGeneralSettingsDialog</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbPanelProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_GENERAL_SETTINGS_DIALOG</value>
                                                        <value name="proxy-Id value" type="Integer">10005</value>
                                                        <value name="proxy-Class" type="string">ctGeneralSettingsDialog</value>
-                                                       <value name="proxy-Fit to content" type="bool">TRUE</value>
+                                                       <value name="proxy-Tab label" type="string">General</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxDOUBLE_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxDOUBLE_BORDER" type="bool">FALSE</value>
@@ -1690,10 +1780,11 @@ list below.</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
+                                                       <value name="proxy-Fit to content" type="bool">TRUE</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">100</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">100</value>
@@ -1708,15 +1799,16 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <value name="proxy-Tab label" type="string">General</value>
-                                                       <path name="IDe52460">
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <path name="IDe78c78">
                                                                <value name="title" type="string">wxBoxSizer V</value>
                                                                <value name="title" type="string">wxBoxSizer V</value>
-                                                               <value name="id" type="Integer">15017056</value>
+                                                               <value name="id" type="Integer">15174776</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">15005408</value>
+                                                               <value name="parent" type="Integer">15161304</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -1730,17 +1822,18 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                               <path name="IDe53a80">
+                                                               <path name="IDe7a2a0">
                                                                        <value name="title" type="string">wxStaticBoxSizer V</value>
                                                                        <value name="title" type="string">wxStaticBoxSizer V</value>
-                                                                       <value name="id" type="Integer">15022720</value>
+                                                                       <value name="id" type="Integer">15180448</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">sizer</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">sizer</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">15017056</value>
+                                                                       <value name="parent" type="Integer">15174776</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticBoxSizerProxy</value>
                                                                        <value name="proxy-Label" type="string">General settings</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticBoxSizerProxy</value>
                                                                        <value name="proxy-Label" type="string">General settings</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                                                        <value name="proxy-AlignH" type="string">Expand</value>
                                                                        <value name="proxy-AlignV" type="string">Centre</value>
                                                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                                                        <value name="proxy-AlignH" type="string">Expand</value>
                                                                        <value name="proxy-AlignV" type="string">Centre</value>
@@ -1752,19 +1845,20 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                                       <path name="IDe554c0">
+                                                                       <path name="IDe7bb40">
                                                                                <value name="title" type="string">wxCheckBox</value>
                                                                                <value name="title" type="string">wxCheckBox</value>
-                                                                               <value name="id" type="Integer">15029440</value>
+                                                                               <value name="id" type="Integer">15186752</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                                <value name="is-transient" type="Integer">0</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                                <value name="is-transient" type="Integer">0</value>
-                                                                               <value name="parent" type="Integer">15022720</value>
+                                                                               <value name="parent" type="Integer">15180448</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbCheckBoxProxy</value>
                                                                                <value name="proxy-Id name" type="string">ID_LOAD_LAST_DOCUMENT</value>
                                                                                <value name="proxy-Id value" type="Integer">10006</value>
                                                                                <value name="proxy-Class" type="string">wxCheckBox</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbCheckBoxProxy</value>
                                                                                <value name="proxy-Id name" type="string">ID_LOAD_LAST_DOCUMENT</value>
                                                                                <value name="proxy-Id value" type="Integer">10006</value>
                                                                                <value name="proxy-Class" type="string">wxCheckBox</value>
+                                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Label" type="string">&amp;Load last document</value>
                                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Label" type="string">&amp;Load last document</value>
@@ -1772,9 +1866,9 @@ list below.</value>
                                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                               <value name="proxy-Background" type="string"></value>
-                                                                               <value name="proxy-Foreground" type="string"></value>
-                                                                               <value name="proxy-Help text" type="string"></value>
+                                                                               <value name="proxy-Background colour" type="string"></value>
+                                                                               <value name="proxy-Foreground colour" type="string"></value>
+                                                                               <value name="proxy-Help text" type="string">Check to load the last document on startup</value>
                                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                                <value name="proxy-Y" type="Integer">-1</value>
                                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                                <value name="proxy-Y" type="Integer">-1</value>
@@ -1791,19 +1885,20 @@ list below.</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        </path>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        </path>
-                                                                       <path name="IDe577e0">
+                                                                       <path name="IDe7e400">
                                                                                <value name="title" type="string">wxCheckBox</value>
                                                                                <value name="title" type="string">wxCheckBox</value>
-                                                                               <value name="id" type="Integer">15038432</value>
+                                                                               <value name="id" type="Integer">15197184</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                                <value name="is-transient" type="Integer">0</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                                <value name="is-transient" type="Integer">0</value>
-                                                                               <value name="parent" type="Integer">15022720</value>
+                                                                               <value name="parent" type="Integer">15180448</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbCheckBoxProxy</value>
                                                                                <value name="proxy-Id name" type="string">ID_SHOW_TOOLTIPS</value>
                                                                                <value name="proxy-Id value" type="Integer">10007</value>
                                                                                <value name="proxy-Class" type="string">wxCheckBox</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbCheckBoxProxy</value>
                                                                                <value name="proxy-Id name" type="string">ID_SHOW_TOOLTIPS</value>
                                                                                <value name="proxy-Id value" type="Integer">10007</value>
                                                                                <value name="proxy-Class" type="string">wxCheckBox</value>
+                                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Label" type="string">&amp;Show tooltips</value>
                                                                                <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-Label" type="string">&amp;Show tooltips</value>
@@ -1811,9 +1906,9 @@ list below.</value>
                                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                               <value name="proxy-Background" type="string"></value>
-                                                                               <value name="proxy-Foreground" type="string"></value>
-                                                                               <value name="proxy-Help text" type="string"></value>
+                                                                               <value name="proxy-Background colour" type="string"></value>
+                                                                               <value name="proxy-Foreground colour" type="string"></value>
+                                                                               <value name="proxy-Help text" type="string">Check to show tooltips</value>
                                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                                <value name="proxy-Y" type="Integer">-1</value>
                                                                                <value name="proxy-Tooltip text" type="string"></value>
                                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                                <value name="proxy-Y" type="Integer">-1</value>
@@ -1830,23 +1925,110 @@ list below.</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        </path>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        </path>
+                                                                       <path name="IDba2a18">
+                                                                               <value name="title" type="string">wxStaticText</value>
+                                                                               <value name="id" type="Integer">12200472</value>
+                                                                               <value name="type" type="string">dialog-control-document</value>
+                                                                               <value name="filename" type="string"></value>
+                                                                               <value name="icon-name" type="string">dialogcontrol</value>
+                                                                               <value name="is-transient" type="Integer">0</value>
+                                                                               <value name="parent" type="Integer">15180448</value>
+                                                                               <value name="locked" type="Integer">0</value>
+                                                                               <value name="proxy-type" type="string">wbStaticTextProxy</value>
+                                                                               <value name="proxy-Id name" type="string">wxID_STATIC</value>
+                                                                               <value name="proxy-Id value" type="Integer">10002</value>
+                                                                               <value name="proxy-Class" type="string">wxStaticText</value>
+                                                                               <value name="proxy-Member variable name" type="string"></value>
+                                                                               <value name="proxy-Label" type="string">&amp;Default file kind to save when using the Go command:</value>
+                                                                               <value name="proxy-Update event handler" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxST_NO_AUTORESIZE" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxDOUBLE_BORDER" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxSUNKEN_BORDER" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxRAISED_BORDER" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxSTATIC_BORDER" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
+                                                                               <value name="proxy-Hidden" type="bool">FALSE</value>
+                                                                               <value name="proxy-Background colour" type="string"></value>
+                                                                               <value name="proxy-Foreground colour" type="string"></value>
+                                                                               <value name="proxy-X" type="Integer">-1</value>
+                                                                               <value name="proxy-Y" type="Integer">-1</value>
+                                                                               <value name="proxy-Width" type="Integer">-1</value>
+                                                                               <value name="proxy-Height" type="Integer">-1</value>
+                                                                               <value name="proxy-AlignH" type="string">Left</value>
+                                                                               <value name="proxy-AlignV" type="string">Centre</value>
+                                                                               <value name="proxy-Stretch factor" type="Integer">0</value>
+                                                                               <value name="proxy-Border" type="Integer">5</value>
+                                                                               <value name="proxy-wxLEFT" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxRIGHT" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxTOP" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxSHAPED" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
+                                                                       </path>
+                                                                       <path name="IDb6dc70">
+                                                                               <value name="title" type="string">wxChoice</value>
+                                                                               <value name="id" type="Integer">11983984</value>
+                                                                               <value name="type" type="string">dialog-control-document</value>
+                                                                               <value name="filename" type="string"></value>
+                                                                               <value name="icon-name" type="string">dialogcontrol</value>
+                                                                               <value name="is-transient" type="Integer">0</value>
+                                                                               <value name="parent" type="Integer">15180448</value>
+                                                                               <value name="locked" type="Integer">0</value>
+                                                                               <value name="proxy-type" type="string">wbChoiceProxy</value>
+                                                                               <value name="proxy-Id name" type="string">ID_DEFAULT_FILE_KIND</value>
+                                                                               <value name="proxy-Id value" type="Integer">10003</value>
+                                                                               <value name="proxy-Class" type="string">wxChoice</value>
+                                                                               <value name="proxy-Member variable name" type="string"></value>
+                                                                               <value name="proxy-Event handler" type="bool">FALSE</value>
+                                                                               <value name="proxy-Update event handler" type="bool">FALSE</value>
+                                                                               <value name="proxy-Strings" type="string">Setup file|Configure script</value>
+                                                                               <value name="proxy-Initial value" type="string">Setup file</value>
+                                                                               <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
+                                                                               <value name="proxy-Hidden" type="bool">FALSE</value>
+                                                                               <value name="proxy-Background colour" type="string"></value>
+                                                                               <value name="proxy-Foreground colour" type="string"></value>
+                                                                               <value name="proxy-Help text" type="string">Select the default kind of file to save using Go</value>
+                                                                               <value name="proxy-Tooltip text" type="string"></value>
+                                                                               <value name="proxy-X" type="Integer">-1</value>
+                                                                               <value name="proxy-Y" type="Integer">-1</value>
+                                                                               <value name="proxy-Width" type="Integer">200</value>
+                                                                               <value name="proxy-Height" type="Integer">-1</value>
+                                                                               <value name="proxy-AlignH" type="string">Expand</value>
+                                                                               <value name="proxy-AlignV" type="string">Centre</value>
+                                                                               <value name="proxy-Stretch factor" type="Integer">0</value>
+                                                                               <value name="proxy-Border" type="Integer">5</value>
+                                                                               <value name="proxy-wxLEFT" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxRIGHT" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxTOP" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
+                                                                               <value name="proxy-wxSHAPED" type="bool">FALSE</value>
+                                                                               <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                                       </path>
                                                                </path>
                                                        </path>
                                                </path>
                                                                </path>
                                                        </path>
                                                </path>
-                                               <path name="IDe4f150">
+                                               <path name="IDe75b90">
                                                        <value name="title" type="string">wxPanel</value>
                                                        <value name="title" type="string">wxPanel</value>
-                                                       <value name="id" type="Integer">15003984</value>
+                                                       <value name="id" type="Integer">15162256</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">14989824</value>
+                                                       <value name="parent" type="Integer">15144888</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbPanelProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_LOCATION_SETTINGS_DIALOG</value>
                                                        <value name="proxy-Id value" type="Integer">10008</value>
                                                        <value name="proxy-Class" type="string">ctLocationSettingsDialog</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbPanelProxy</value>
                                                        <value name="proxy-Id name" type="string">ID_LOCATION_SETTINGS_DIALOG</value>
                                                        <value name="proxy-Id value" type="Integer">10008</value>
                                                        <value name="proxy-Class" type="string">ctLocationSettingsDialog</value>
-                                                       <value name="proxy-Fit to content" type="bool">TRUE</value>
+                                                       <value name="proxy-Tab label" type="string">Locations</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxDOUBLE_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
                                                        <value name="proxy-wxDOUBLE_BORDER" type="bool">FALSE</value>
@@ -1857,10 +2039,11 @@ list below.</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxCLIP_CHILDREN " type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
+                                                       <value name="proxy-Fit to content" type="bool">TRUE</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">100</value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                        <value name="proxy-Width" type="Integer">100</value>
@@ -1875,15 +2058,16 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                       <value name="proxy-Tab label" type="string">Locations</value>
-                                                       <path name="IDe5bbd0">
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <path name="IDe82ac0">
                                                                <value name="title" type="string">wxBoxSizer V</value>
                                                                <value name="title" type="string">wxBoxSizer V</value>
-                                                               <value name="id" type="Integer">15055824</value>
+                                                               <value name="id" type="Integer">15215296</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
                                                                <value name="type" type="string">dialog-control-document</value>
                                                                <value name="filename" type="string"></value>
                                                                <value name="icon-name" type="string">sizer</value>
                                                                <value name="is-transient" type="Integer">0</value>
-                                                               <value name="parent" type="Integer">15003984</value>
+                                                               <value name="parent" type="Integer">15162256</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
                                                                <value name="locked" type="Integer">0</value>
                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                <value name="proxy-Orientation" type="string">Vertical</value>
@@ -1897,17 +2081,18 @@ list below.</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                               <path name="IDe5ce70">
+                                                               <path name="IDe84088">
                                                                        <value name="title" type="string">wxStaticBoxSizer V</value>
                                                                        <value name="title" type="string">wxStaticBoxSizer V</value>
-                                                                       <value name="id" type="Integer">15060592</value>
+                                                                       <value name="id" type="Integer">15220872</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">sizer</value>
                                                                        <value name="is-transient" type="Integer">0</value>
                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                        <value name="filename" type="string"></value>
                                                                        <value name="icon-name" type="string">sizer</value>
                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                       <value name="parent" type="Integer">15055824</value>
+                                                                       <value name="parent" type="Integer">15215296</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticBoxSizerProxy</value>
                                                                        <value name="proxy-Label" type="string">Locations</value>
                                                                        <value name="locked" type="Integer">0</value>
                                                                        <value name="proxy-type" type="string">wbStaticBoxSizerProxy</value>
                                                                        <value name="proxy-Label" type="string">Locations</value>
+                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                                                        <value name="proxy-AlignH" type="string">Expand</value>
                                                                        <value name="proxy-AlignV" type="string">Centre</value>
                                                                        <value name="proxy-Orientation" type="string">Vertical</value>
                                                                        <value name="proxy-AlignH" type="string">Expand</value>
                                                                        <value name="proxy-AlignV" type="string">Centre</value>
@@ -1919,20 +2104,22 @@ list below.</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                                       <path name="IDe5e8e8">
+                                                                       <path name="IDe85950">
                                                                                <value name="title" type="string">wxStaticText</value>
                                                                                <value name="title" type="string">wxStaticText</value>
-                                                                               <value name="id" type="Integer">15067368</value>
+                                                                               <value name="id" type="Integer">15227216</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                                <value name="is-transient" type="Integer">0</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">dialogcontrol</value>
                                                                                <value name="is-transient" type="Integer">0</value>
-                                                                               <value name="parent" type="Integer">15060592</value>
+                                                                               <value name="parent" type="Integer">15220872</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                                                <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                                                <value name="proxy-Id value" type="Integer">5105</value>
                                                                                <value name="proxy-Class" type="string">wxStaticText</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbStaticTextProxy</value>
                                                                                <value name="proxy-Id name" type="string">wxID_STATIC</value>
                                                                                <value name="proxy-Id value" type="Integer">5105</value>
                                                                                <value name="proxy-Class" type="string">wxStaticText</value>
+                                                                               <value name="proxy-Member variable name" type="string"></value>
                                                                                <value name="proxy-Label" type="string">&amp;wxWindows hierarchy:</value>
                                                                                <value name="proxy-Label" type="string">&amp;wxWindows hierarchy:</value>
+                                                                               <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                                                <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                                                <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
                                                                                <value name="proxy-wxALIGN_LEFT" type="bool">FALSE</value>
                                                                                <value name="proxy-wxALIGN_RIGHT" type="bool">FALSE</value>
                                                                                <value name="proxy-wxALIGN_CENTRE" type="bool">FALSE</value>
@@ -1946,8 +2133,8 @@ list below.</value>
                                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                                <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                               <value name="proxy-Background" type="string"></value>
-                                                                               <value name="proxy-Foreground" type="string"></value>
+                                                                               <value name="proxy-Background colour" type="string"></value>
+                                                                               <value name="proxy-Foreground colour" type="string"></value>
                                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                                <value name="proxy-Y" type="Integer">-1</value>
                                                                                <value name="proxy-Width" type="Integer">-1</value>
                                                                                <value name="proxy-X" type="Integer">-1</value>
                                                                                <value name="proxy-Y" type="Integer">-1</value>
                                                                                <value name="proxy-Width" type="Integer">-1</value>
@@ -1963,14 +2150,14 @@ list below.</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                                        </path>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">TRUE</value>
                                                                        </path>
-                                                                       <path name="IDe61400">
+                                                                       <path name="IDe88af8">
                                                                                <value name="title" type="string">wxBoxSizer H</value>
                                                                                <value name="title" type="string">wxBoxSizer H</value>
-                                                                               <value name="id" type="Integer">15078400</value>
+                                                                               <value name="id" type="Integer">15239928</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">sizer</value>
                                                                                <value name="is-transient" type="Integer">0</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">sizer</value>
                                                                                <value name="is-transient" type="Integer">0</value>
-                                                                               <value name="parent" type="Integer">15060592</value>
+                                                                               <value name="parent" type="Integer">15220872</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                                <value name="proxy-Orientation" type="string">Horizontal</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                                <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -1984,19 +2171,20 @@ list below.</value>
                                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                                               <path name="IDe62ba8">
+                                                                               <path name="IDe89cd0">
                                                                                        <value name="title" type="string">wxTextCtrl</value>
                                                                                        <value name="title" type="string">wxTextCtrl</value>
-                                                                                       <value name="id" type="Integer">15084456</value>
+                                                                                       <value name="id" type="Integer">15244496</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                                       <value name="parent" type="Integer">15078400</value>
+                                                                                       <value name="parent" type="Integer">15239928</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbTextCtrlProxy</value>
                                                                                        <value name="proxy-Id name" type="string">ID_WXWIN_HIERARCHY</value>
                                                                                        <value name="proxy-Id value" type="Integer">10010</value>
                                                                                        <value name="proxy-Class" type="string">wxTextCtrl</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbTextCtrlProxy</value>
                                                                                        <value name="proxy-Id name" type="string">ID_WXWIN_HIERARCHY</value>
                                                                                        <value name="proxy-Id value" type="Integer">10010</value>
                                                                                        <value name="proxy-Class" type="string">wxTextCtrl</value>
+                                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                                        <value name="proxy-Initial value" type="string"></value>
                                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                                        <value name="proxy-Initial value" type="string"></value>
@@ -2024,9 +2212,9 @@ list below.</value>
                                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                                       <value name="proxy-Background" type="string"></value>
-                                                                                       <value name="proxy-Foreground" type="string"></value>
-                                                                                       <value name="proxy-Help text" type="string"></value>
+                                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                                       <value name="proxy-Foreground colour" type="string"></value>
+                                                                                       <value name="proxy-Help text" type="string">Enter the root path of the wxWindows hierarchy</value>
                                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                                        <value name="proxy-Y" type="Integer">-1</value>
@@ -2043,19 +2231,20 @@ list below.</value>
                                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                </path>
                                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                </path>
-                                                                               <path name="IDe66b20">
+                                                                               <path name="IDe8e4c8">
                                                                                        <value name="title" type="string">wxButton</value>
                                                                                        <value name="title" type="string">wxButton</value>
-                                                                                       <value name="id" type="Integer">15100704</value>
+                                                                                       <value name="id" type="Integer">15262920</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                                       <value name="parent" type="Integer">15078400</value>
+                                                                                       <value name="parent" type="Integer">15239928</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                                        <value name="proxy-Id name" type="string">ID_CHOOSE_WXWIN_HIERARCHY</value>
                                                                                        <value name="proxy-Id value" type="Integer">10011</value>
                                                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                                                        <value name="proxy-Id name" type="string">ID_CHOOSE_WXWIN_HIERARCHY</value>
                                                                                        <value name="proxy-Id value" type="Integer">10011</value>
                                                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                                        <value name="proxy-Label" type="string">&amp;Choose...</value>
                                                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                                                        <value name="proxy-Update event handler" type="bool">TRUE</value>
                                                                                        <value name="proxy-Label" type="string">&amp;Choose...</value>
@@ -2068,9 +2257,10 @@ list below.</value>
                                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                                       <value name="proxy-Background" type="string"></value>
-                                                                                       <value name="proxy-Foreground" type="string"></value>
-                                                                                       <value name="proxy-Help text" type="string"></value>
+                                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                                       <value name="proxy-Foreground colour" type="string"></value>
+                                                                                       <value name="proxy-Help text" type="string">Click to choose the root path of the wxWindows hierarchy
+</value>
                                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                                        <value name="proxy-Y" type="Integer">-1</value>
@@ -2088,14 +2278,14 @@ list below.</value>
                                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                </path>
                                                                        </path>
                                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                </path>
                                                                        </path>
-                                                                       <path name="IDe690f8">
+                                                                       <path name="IDe90d78">
                                                                                <value name="title" type="string">wxBoxSizer H</value>
                                                                                <value name="title" type="string">wxBoxSizer H</value>
-                                                                               <value name="id" type="Integer">15110392</value>
+                                                                               <value name="id" type="Integer">15273336</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">sizer</value>
                                                                                <value name="is-transient" type="Integer">0</value>
                                                                                <value name="type" type="string">dialog-control-document</value>
                                                                                <value name="filename" type="string"></value>
                                                                                <value name="icon-name" type="string">sizer</value>
                                                                                <value name="is-transient" type="Integer">0</value>
-                                                                               <value name="parent" type="Integer">15060592</value>
+                                                                               <value name="parent" type="Integer">15220872</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                                <value name="proxy-Orientation" type="string">Horizontal</value>
                                                                                <value name="locked" type="Integer">0</value>
                                                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                                                <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -2109,14 +2299,14 @@ list below.</value>
                                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                <value name="proxy-wxBOTTOM" type="bool">FALSE</value>
                                                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                                                               <path name="IDe6a0b8">
+                                                                               <path name="IDe91d88">
                                                                                        <value name="title" type="string">Spacer</value>
                                                                                        <value name="title" type="string">Spacer</value>
-                                                                                       <value name="id" type="Integer">15114424</value>
+                                                                                       <value name="id" type="Integer">15277448</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                                       <value name="parent" type="Integer">15110392</value>
+                                                                                       <value name="parent" type="Integer">15273336</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                                                        <value name="proxy-Width" type="Integer">60</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                                                        <value name="proxy-Width" type="Integer">60</value>
@@ -2132,19 +2322,20 @@ list below.</value>
                                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                </path>
                                                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                                                </path>
-                                                                               <path name="IDe6b1c8">
+                                                                               <path name="IDe92d98">
                                                                                        <value name="title" type="string">wxCheckBox</value>
                                                                                        <value name="title" type="string">wxCheckBox</value>
-                                                                                       <value name="id" type="Integer">15118792</value>
+                                                                                       <value name="id" type="Integer">15281560</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
                                                                                        <value name="type" type="string">dialog-control-document</value>
                                                                                        <value name="filename" type="string"></value>
                                                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                                                        <value name="is-transient" type="Integer">0</value>
-                                                                                       <value name="parent" type="Integer">15110392</value>
+                                                                                       <value name="parent" type="Integer">15273336</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbCheckBoxProxy</value>
                                                                                        <value name="proxy-Id name" type="string">ID_USE_WXWIN</value>
                                                                                        <value name="proxy-Id value" type="Integer">10012</value>
                                                                                        <value name="proxy-Class" type="string">wxCheckBox</value>
                                                                                        <value name="locked" type="Integer">0</value>
                                                                                        <value name="proxy-type" type="string">wbCheckBoxProxy</value>
                                                                                        <value name="proxy-Id name" type="string">ID_USE_WXWIN</value>
                                                                                        <value name="proxy-Id value" type="Integer">10012</value>
                                                                                        <value name="proxy-Class" type="string">wxCheckBox</value>
+                                                                                       <value name="proxy-Member variable name" type="string"></value>
                                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                        <value name="proxy-Label" type="string">&amp;Use WXWIN environment variable</value>
                                                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                                                        <value name="proxy-Label" type="string">&amp;Use WXWIN environment variable</value>
@@ -2152,9 +2343,9 @@ list below.</value>
                                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                                                       <value name="proxy-Background" type="string"></value>
-                                                                                       <value name="proxy-Foreground" type="string"></value>
-                                                                                       <value name="proxy-Help text" type="string"></value>
+                                                                                       <value name="proxy-Background colour" type="string"></value>
+                                                                                       <value name="proxy-Foreground colour" type="string"></value>
+                                                                                       <value name="proxy-Help text" type="string">Check to use the value of WXWIN instead</value>
                                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                                        <value name="proxy-Y" type="Integer">-1</value>
                                                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                                                        <value name="proxy-X" type="Integer">-1</value>
                                                                                        <value name="proxy-Y" type="Integer">-1</value>
@@ -2176,14 +2367,14 @@ list below.</value>
                                                        </path>
                                                </path>
                                        </path>
                                                        </path>
                                                </path>
                                        </path>
-                                       <path name="IDb686f0">
+                                       <path name="IDe7bcf8">
                                                <value name="title" type="string">wxBoxSizer H</value>
                                                <value name="title" type="string">wxBoxSizer H</value>
-                                               <value name="id" type="Integer">11962096</value>
+                                               <value name="id" type="Integer">15187192</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">sizer</value>
                                                <value name="is-transient" type="Integer">0</value>
                                                <value name="type" type="string">dialog-control-document</value>
                                                <value name="filename" type="string"></value>
                                                <value name="icon-name" type="string">sizer</value>
                                                <value name="is-transient" type="Integer">0</value>
-                                               <value name="parent" type="Integer">14984680</value>
+                                               <value name="parent" type="Integer">15140008</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                <value name="proxy-Orientation" type="string">Horizontal</value>
                                                <value name="locked" type="Integer">0</value>
                                                <value name="proxy-type" type="string">wbBoxSizerProxy</value>
                                                <value name="proxy-Orientation" type="string">Horizontal</value>
@@ -2197,14 +2388,14 @@ list below.</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
-                                               <path name="IDe6d678">
+                                               <path name="IDe718a0">
                                                        <value name="title" type="string">Spacer</value>
                                                        <value name="title" type="string">Spacer</value>
-                                                       <value name="id" type="Integer">15128184</value>
+                                                       <value name="id" type="Integer">15145120</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11962096</value>
+                                                       <value name="parent" type="Integer">15187192</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                        <value name="proxy-Width" type="Integer">5</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbSpacerProxy</value>
                                                        <value name="proxy-Width" type="Integer">5</value>
@@ -2220,19 +2411,20 @@ list below.</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                </path>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                </path>
-                                               <path name="IDe6e618">
+                                               <path name="IDe95fa0">
                                                        <value name="title" type="string">wxButton</value>
                                                        <value name="title" type="string">wxButton</value>
-                                                       <value name="id" type="Integer">15132184</value>
+                                                       <value name="id" type="Integer">15294368</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11962096</value>
+                                                       <value name="parent" type="Integer">15187192</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_OK</value>
                                                        <value name="proxy-Id value" type="Integer">5100</value>
                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_OK</value>
                                                        <value name="proxy-Id value" type="Integer">5100</value>
                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Label" type="string">&amp;OK</value>
                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Label" type="string">&amp;OK</value>
@@ -2245,8 +2437,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -2264,19 +2456,20 @@ list below.</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                </path>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                </path>
-                                               <path name="IDe70b78">
+                                               <path name="IDe98798">
                                                        <value name="title" type="string">wxButton</value>
                                                        <value name="title" type="string">wxButton</value>
-                                                       <value name="id" type="Integer">15141752</value>
+                                                       <value name="id" type="Integer">15304600</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11962096</value>
+                                                       <value name="parent" type="Integer">15187192</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_CANCEL</value>
                                                        <value name="proxy-Id value" type="Integer">5101</value>
                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_CANCEL</value>
                                                        <value name="proxy-Id value" type="Integer">5101</value>
                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Label" type="string">&amp;Cancel</value>
                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Label" type="string">&amp;Cancel</value>
@@ -2289,8 +2482,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -2307,20 +2500,23 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDe73130">
+                                               <path name="IDe9b330">
                                                        <value name="title" type="string">wxButton</value>
                                                        <value name="title" type="string">wxButton</value>
-                                                       <value name="id" type="Integer">15151408</value>
+                                                       <value name="id" type="Integer">15315760</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11962096</value>
+                                                       <value name="parent" type="Integer">15187192</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_HELP</value>
                                                        <value name="proxy-Id value" type="Integer">5009</value>
                                                        <value name="proxy-Class" type="string">wxButton</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_HELP</value>
                                                        <value name="proxy-Id value" type="Integer">5009</value>
                                                        <value name="proxy-Class" type="string">wxButton</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Label" type="string">&amp;Help</value>
                                                        <value name="proxy-Event handler" type="bool">TRUE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Label" type="string">&amp;Help</value>
@@ -2333,8 +2529,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -2351,20 +2547,23 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                                </path>
-                                               <path name="IDe75838">
+                                               <path name="IDe9dfe0">
                                                        <value name="title" type="string">wxContextHelpButton</value>
                                                        <value name="title" type="string">wxContextHelpButton</value>
-                                                       <value name="id" type="Integer">15161400</value>
+                                                       <value name="id" type="Integer">15327200</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
                                                        <value name="type" type="string">dialog-control-document</value>
                                                        <value name="filename" type="string"></value>
                                                        <value name="icon-name" type="string">dialogcontrol</value>
                                                        <value name="is-transient" type="Integer">0</value>
-                                                       <value name="parent" type="Integer">11962096</value>
+                                                       <value name="parent" type="Integer">15187192</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbContextHelpButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_CONTEXT_HELP</value>
                                                        <value name="proxy-Id value" type="Integer">5112</value>
                                                        <value name="proxy-Class" type="string">wxContextHelpButton</value>
                                                        <value name="locked" type="Integer">0</value>
                                                        <value name="proxy-type" type="string">wbContextHelpButtonProxy</value>
                                                        <value name="proxy-Id name" type="string">wxID_CONTEXT_HELP</value>
                                                        <value name="proxy-Id value" type="Integer">5112</value>
                                                        <value name="proxy-Class" type="string">wxContextHelpButton</value>
+                                                       <value name="proxy-Member variable name" type="string"></value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Platforms" type="string">__WXGTK__,__WXMAC__</value>
                                                        <value name="proxy-Event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Update event handler" type="bool">FALSE</value>
                                                        <value name="proxy-Platforms" type="string">__WXGTK__,__WXMAC__</value>
@@ -2375,8 +2574,8 @@ list below.</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
                                                        <value name="proxy-wxWANTS_CHARS" type="bool">FALSE</value>
                                                        <value name="proxy-wxNO_FULL_REPAINT_ON_RESIZE" type="bool">FALSE</value>
                                                        <value name="proxy-Hidden" type="bool">FALSE</value>
-                                                       <value name="proxy-Background" type="string"></value>
-                                                       <value name="proxy-Foreground" type="string"></value>
+                                                       <value name="proxy-Background colour" type="string"></value>
+                                                       <value name="proxy-Foreground colour" type="string"></value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
                                                        <value name="proxy-Help text" type="string"></value>
                                                        <value name="proxy-Tooltip text" type="string"></value>
                                                        <value name="proxy-X" type="Integer">-1</value>
@@ -2393,19 +2592,21 @@ list below.</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
                                                        <value name="proxy-wxBOTTOM" type="bool">TRUE</value>
                                                        <value name="proxy-wxSHAPED" type="bool">FALSE</value>
                                                        <value name="proxy-wxADJUST_MINSIZE" type="bool">FALSE</value>
+                                                       <value name="proxy-Background" type="string"></value>
+                                                       <value name="proxy-Foreground" type="string"></value>
                                                </path>
                                        </path>
                                </path>
                        </path>
                </path>
                                                </path>
                                        </path>
                                </path>
                        </path>
                </path>
-               <path name="IDb73f98">
+               <path name="IDb530b0">
                        <value name="title" type="string">Images</value>
                        <value name="title" type="string">Images</value>
-                       <value name="id" type="Integer">12009368</value>
+                       <value name="id" type="Integer">11874480</value>
                        <value name="type" type="string">html-document</value>
                        <value name="filename" type="string"></value>
                        <value name="icon-name" type="string">bitmapsfolder</value>
                        <value name="is-transient" type="Integer">1</value>
                        <value name="type" type="string">html-document</value>
                        <value name="filename" type="string"></value>
                        <value name="icon-name" type="string">bitmapsfolder</value>
                        <value name="is-transient" type="Integer">1</value>
-                       <value name="parent" type="Integer">11769864</value>
+                       <value name="parent" type="Integer">12159224</value>
                        <value name="locked" type="Integer">1</value>
                </path>
        </path>
                        <value name="locked" type="Integer">1</value>
                </path>
        </path>
wxWidgets (Impactor)