Renamed Platform -> Target

Bumped version

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/configtool/configs/wxwin250.wxs b/utils/configtool/configs/wxwin250.wxs
index 6a2d9fb41fe4372e41a209e2f62e80508709bd1c..907b9ad6dfc2d40a51f8d54392dee9193662af80 100644 (file)
--- a/utils/configtool/configs/wxwin250.wxs
+++ b/utils/configtool/configs/wxwin250.wxs
@@ -18,8 +18,10 @@
         <setting type="group">
             <active>1</active>
             <enabled>0</enabled>
         <setting type="group">
             <active>1</active>
             <enabled>0</enabled>

-            <name>Platform</name>
-            <description>&lt;B&gt;Choose a platform&lt;/B&gt;</description>
+            <name>Target</name>
+            <description>&lt;B&gt;Choose a target&lt;/B&gt;&lt;P&gt;
+
+There may be several targets per platform; for example on MS Windows, you can choose the native widgets target (Windows) or the wxUniversal widgets target (Windows/Universal).</description>

             <default-state>1</default-state>
             <requires></requires>
             <precludes></precludes>
             <default-state>1</default-state>
             <requires></requires>
             <precludes></precludes>


@@ -36,14 +38,32 @@
                 <name>Windows</name>
                 <description>&lt;B&gt;The WIN32 port.&lt;/B&gt;&lt;P&gt;
 
                 <name>Windows</name>
                 <description>&lt;B&gt;The WIN32 port.&lt;/B&gt;&lt;P&gt;
 

-This port is for Windows 9x, ME, NT, 2K, XP.
+This port is for Windows 9x, ME, NT, 2K, XP, using the native widgets.

 </description>
                 <default-state>1</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>
 </description>
                 <default-state>1</default-state>
                 <requires></requires>
                 <precludes></precludes>
                 <enabled-if></enabled-if>
                 <enabled-if-not></enabled-if-not>

-                <exclusivity>MGL,X11,Mac Carbon,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine</exclusivity>
+                <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>
+                <help-topic></help-topic>
+                <notes></notes>
+            </setting>
+            <setting type="bool-radio">
+                <active>1</active>
+                <enabled>1</enabled>
+                <name>Windows/Universal</name>
+                <description>&lt;b&gt;Windows/Universal&lt;/b&gt;&lt;P&gt;
+
+A port for MS Windows, using the wxUniversal widget set.</description>
+                <default-state>1</default-state>
+                <requires></requires>
+                <precludes></precludes>
+                <enabled-if></enabled-if>
+                <enabled-if-not></enabled-if-not>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-msw</configure-command>
                 <help-topic></help-topic>


@@ -62,7 +82,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>

-                <exclusivity>MGL,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-x11</configure-command>
                 <help-topic></help-topic>


@@ -81,7 +101,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>

-                <exclusivity>MGL,X11,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-mac</configure-command>
                 <help-topic></help-topic>


@@ -99,7 +119,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>

-                <exclusivity>GTK+ 2.x,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-cocoa</configure-command>
                 <help-topic></help-topic>


@@ -118,7 +138,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>

-                <exclusivity>MGL,X11,Mac Carbon,Windows,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-gtk</configure-command>
                 <help-topic></help-topic>


@@ -126,7 +146,7 @@ This port is based on the GTK+ 1.x and 2.x widget set.
             </setting>
             <setting type="bool-radio">
                 <active>1</active>
             </setting>
             <setting type="bool-radio">
                 <active>1</active>

-                <enabled>1</enabled>
+                <enabled>0</enabled>

                 <name>GTK+ 2.x</name>
                 <description>&lt;B&gt;wxGTK with GTK+ 2&lt;/B&gt;&lt;P&gt;
 
                 <name>GTK+ 2.x</name>
                 <description>&lt;B&gt;wxGTK with GTK+ 2&lt;/B&gt;&lt;P&gt;
 


@@ -136,7 +156,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>

-                <exclusivity>Mac Cocoa,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-gtk2</configure-command>
                 <help-topic></help-topic>


@@ -155,7 +175,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>

-                <exclusivity>MGL,X11,Mac Carbon,Windows,GTK+ 1.x,OS/2,Mac Cocoa,GTK+ 2.x,Wine</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-motif</configure-command>
                 <help-topic></help-topic>


@@ -173,7 +193,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>

-                <exclusivity>GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,X11,Mac Cocoa,GTK+ 2.x,Wine</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-pm</configure-command>
                 <help-topic></help-topic>


@@ -191,7 +211,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>

-                <exclusivity>Mac Cocoa,GTK+ 1.x,GTK+ 2.x,Mac Carbon,MGL,Motif,Windows,OS/2,X11</exclusivity>
+                <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>
                 <help-topic></help-topic>
                 <context></context>
                 <configure-command>--with-wine</configure-command>
                 <help-topic></help-topic>


@@ -209,7 +229,7 @@ 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>

-                <exclusivity>X11,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,Wine,GTK+ 2.x</exclusivity>
+                <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>
                 <context></context>
                 <configure-command>--with-mgl</configure-command>
                 <help-topic></help-topic>


@@ -253,13 +273,13 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
             </setting>
             <setting type="bool-check">
                 <active>0</active>
             </setting>
             <setting type="bool-check">
                 <active>0</active>

-                <enabled>0</enabled>
+                <enabled>1</enabled>

                 <name>__WXMSW__</name>
                 <description>This is enabled if the relevant platform settings are enabled.</description>
                 <default-state>1</default-state>
                 <name>__WXMSW__</name>
                 <description>This is enabled if the relevant platform settings are enabled.</description>
                 <default-state>1</default-state>

-                <requires>Windows,Wine</requires>
+                <requires>Windows,Wine,Windows/Universal</requires>

                 <precludes></precludes>
                 <precludes></precludes>

-                <enabled-if>Windows,Wine</enabled-if>
+                <enabled-if>Windows,Wine,Windows/Universal</enabled-if>

                 <enabled-if-not></enabled-if-not>
                 <exclusivity></exclusivity>
                 <context></context>
                 <enabled-if-not></enabled-if-not>
                 <exclusivity></exclusivity>
                 <context></context>


@@ -269,7 +289,7 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
             </setting>
             <setting type="bool-check">
                 <active>0</active>
             </setting>
             <setting type="bool-check">
                 <active>0</active>

-                <enabled>1</enabled>
+                <enabled>0</enabled>

                 <name>__WXGTK__</name>
                 <description>This is enabled if the relevant platform settings are enabled.
 </description>
                 <name>__WXGTK__</name>
                 <description>This is enabled if the relevant platform settings are enabled.
 </description>


@@ -286,7 +306,7 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
             </setting>
             <setting type="bool-check">
                 <active>0</active>
             </setting>
             <setting type="bool-check">
                 <active>0</active>

-                <enabled>1</enabled>
+                <enabled>0</enabled>

                 <name>__WXGTK20__</name>
                 <description>This is enabled if the relevant platform settings are enabled.
 </description>
                 <name>__WXGTK20__</name>
                 <description>This is enabled if the relevant platform settings are enabled.
 </description>


@@ -405,14 +425,14 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
             </setting>
             <setting type="bool-check">
                 <active>0</active>
             </setting>
             <setting type="bool-check">
                 <active>0</active>

-                <enabled>0</enabled>
+                <enabled>1</enabled>

                 <name>__WXUNIVERSAL__</name>
                 <description>This is enabled if the relevant platform settings are enabled.
 </description>
                 <default-state>1</default-state>
                 <name>__WXUNIVERSAL__</name>
                 <description>This is enabled if the relevant platform settings are enabled.
 </description>
                 <default-state>1</default-state>

-                <requires>X11,MGL</requires>
+                <requires>X11,MGL,Windows/Universal</requires>

                 <precludes></precludes>
                 <precludes></precludes>

-                <enabled-if>X11,MGL</enabled-if>
+                <enabled-if>X11,MGL,Windows/Universal</enabled-if>

                 <enabled-if-not></enabled-if-not>
                 <exclusivity></exclusivity>
                 <context></context>
                 <enabled-if-not></enabled-if-not>
                 <exclusivity></exclusivity>
                 <context></context>


@@ -421,8 +441,8 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
                 <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_UNIVERSAL</name>
                 <description>&lt;B&gt;Universal&lt;/B&gt;&lt;P&gt;
 
                 <name>wxUSE_UNIVERSAL</name>
                 <description>&lt;B&gt;Universal&lt;/B&gt;&lt;P&gt;
 


@@ -430,13 +450,13 @@ 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>
 
 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></requires>
+                <requires>__WXUNIVERSAL__</requires>

                 <precludes></precludes>
                 <enabled-if>__WXUNIVERSAL__</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <exclusivity></exclusivity>
                 <context></context>
                 <precludes></precludes>
                 <enabled-if>__WXUNIVERSAL__</enabled-if>
                 <enabled-if-not></enabled-if-not>
                 <exclusivity></exclusivity>
                 <context></context>

-                <configure-command></configure-command>
+                <configure-command>--enable-universal</configure-command>

                 <help-topic></help-topic>
                 <notes></notes>
             </setting>
                 <help-topic></help-topic>
                 <notes></notes>
             </setting>


@@ -802,7 +822,7 @@ Recommended setting: 0 (please update your code)
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <notes></notes>
             </setting>
             <setting type="bool-check">

-                <active>0</active>
+                <active>1</active>

                 <enabled>1</enabled>
                 <name>wxFONT_SIZE_COMPATIBILITY</name>
                 <description>&lt;B&gt;Define as 1 for font size to be backward compatible to 1.63 and earlier.&lt;/B&gt;&lt;P&gt;
                 <enabled>1</enabled>
                 <name>wxFONT_SIZE_COMPATIBILITY</name>
                 <description>&lt;B&gt;Define as 1 for font size to be backward compatible to 1.63 and earlier.&lt;/B&gt;&lt;P&gt;


@@ -823,7 +843,7 @@ Default is 0.
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <notes></notes>
             </setting>
             <setting type="bool-check">

-                <active>0</active>
+                <active>1</active>

                 <enabled>1</enabled>
                 <name>wxDIALOG_UNIT_COMPATIBILITY</name>
                 <description>&lt;B&gt;Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.&lt;/B&gt;&lt;P&gt;
                 <enabled>1</enabled>
                 <name>wxDIALOG_UNIT_COMPATIBILITY</name>
                 <description>&lt;B&gt;Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.&lt;/B&gt;&lt;P&gt;


@@ -958,7 +978,7 @@ Default: 0. Recommended setting: 0
                 <notes></notes>
             </setting>
             <setting type="bool-check">
                 <notes></notes>
             </setting>
             <setting type="bool-check">

-                <active>0</active>
+                <active>1</active>

                 <enabled>1</enabled>
                 <name>wxUSE_ON_FATAL_EXCEPTION</name>
                 <description>&lt;B&gt;Fatal exceptions handling&lt;/B&gt;&lt;P&gt;
                 <enabled>1</enabled>
                 <name>wxUSE_ON_FATAL_EXCEPTION</name>
                 <description>&lt;B&gt;Fatal exceptions handling&lt;/B&gt;&lt;P&gt;


@@ -2542,7 +2562,7 @@ This class is needed by wxNotebook, wxTreeCtrl and wxListCtrl.
                 <notes></notes>
             </setting>
             <setting type="check-group">
                 <notes></notes>
             </setting>
             <setting type="check-group">

-                <active>0</active>
+                <active>1</active>

                 <enabled>1</enabled>
                 <name>wxUSE_METAFILE</name>
                 <description>&lt;B&gt;wxMetaFile&lt;/B&gt;&lt;P&gt;
                 <enabled>1</enabled>
                 <name>wxUSE_METAFILE</name>
                 <description>&lt;B&gt;wxMetaFile&lt;/B&gt;&lt;P&gt;


@@ -2568,7 +2588,7 @@ Recommended setting: default or 0 for everything for portable programs.
                 <help-topic>wxMetaFile</help-topic>
                 <notes></notes>
                 <setting type="bool-check">
                 <help-topic>wxMetaFile</help-topic>
                 <notes></notes>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_ENH_METAFILE</name>
                     <description>&lt;B&gt;wxEnhMetaFile&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_ENH_METAFILE</name>
                     <description>&lt;B&gt;wxEnhMetaFile&lt;/B&gt;&lt;P&gt;


@@ -2586,7 +2606,7 @@ Enhanced metafile (recommended).</description>
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_WIN_METAFILES_ALWAYS</name>
                     <description>This option is obsolete. Set to 0.</description>
                     <enabled>1</enabled>
                     <name>wxUSE_WIN_METAFILES_ALWAYS</name>
                     <description>This option is obsolete. Set to 0.</description>


@@ -2807,7 +2827,7 @@ Set to 1 for XPM format support.
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_ICO_CUR</name>
                     <description>&lt;B&gt;MS Windows icons and cursors support&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_ICO_CUR</name>
                     <description>&lt;B&gt;MS Windows icons and cursors support&lt;/B&gt;&lt;P&gt;


@@ -3769,7 +3789,7 @@ Default: 1.</description>
                 <help-topic>wxHelpController</help-topic>
                 <notes></notes>
                 <setting type="bool-check">
                 <help-topic>wxHelpController</help-topic>
                 <notes></notes>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_MS_HTML_HELP</name>
                     <description>&lt;B&gt;MS HTML Help&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_MS_HTML_HELP</name>
                     <description>&lt;B&gt;MS HTML Help&lt;/B&gt;&lt;P&gt;


@@ -3844,7 +3864,7 @@ Settings for various input devices.</description>
             <help-topic></help-topic>
             <notes></notes>
             <setting type="bool-check">
             <help-topic></help-topic>
             <notes></notes>
             <setting type="bool-check">

-                <active>0</active>
+                <active>1</active>

                 <enabled>1</enabled>
                 <name>wxUSE_MOUSEWHEEL</name>
                 <description>&lt;B&gt;Mousewheel support&lt;/B&gt;&lt;P&gt;
                 <enabled>1</enabled>
                 <name>wxUSE_MOUSEWHEEL</name>
                 <description>&lt;B&gt;Mousewheel support&lt;/B&gt;&lt;P&gt;


@@ -4069,7 +4089,7 @@ Default: 0
                 <help-topic></help-topic>
                 <notes></notes>
                 <setting type="bool-check">
                 <help-topic></help-topic>
                 <notes></notes>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_OWNER_DRAWN</name>
                     <description>&lt;B&gt;Owner-drawn controls&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_OWNER_DRAWN</name>
                     <description>&lt;B&gt;Owner-drawn controls&lt;/B&gt;&lt;P&gt;


@@ -4090,7 +4110,7 @@ Default: 1. Recommended setting: 1, set to 0 for a small library size reduction.
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_RICHEDIT</name>
                     <description>&lt;B&gt;Rich edit control support&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_RICHEDIT</name>
                     <description>&lt;B&gt;Rich edit control support&lt;/B&gt;&lt;P&gt;


@@ -4111,7 +4131,7 @@ Default: 1 for compilers which support it  Recommended setting: 1, only set it t
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_RICHEDIT2</name>
                     <description>&lt;B&gt;Rich edit control version 2&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_RICHEDIT2</name>
                     <description>&lt;B&gt;Rich edit control version 2&lt;/B&gt;&lt;P&gt;


@@ -4131,7 +4151,7 @@ Default: 1</description>
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>0</enabled>
                     <name>wxUSE_MFC</name>
                     <description>&lt;B&gt;MFC interoperation&lt;/B&gt;&lt;P&gt;
                     <enabled>0</enabled>
                     <name>wxUSE_MFC</name>
                     <description>&lt;B&gt;MFC interoperation&lt;/B&gt;&lt;P&gt;


@@ -4152,7 +4172,7 @@ Default: 0. Recommended setting: 0 unless you really have to use MFC
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_OLE</name>
                     <description>&lt;B&gt;OLE support&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_OLE</name>
                     <description>&lt;B&gt;OLE support&lt;/B&gt;&lt;P&gt;


@@ -4173,7 +4193,7 @@ Default: 1. Recommended setting: 1
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_UXTHEME</name>
                     <description>&lt;B&gt;MS Windows XP UX Theme Engine support&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_UXTHEME</name>
                     <description>&lt;B&gt;MS Windows XP UX Theme Engine support&lt;/B&gt;&lt;P&gt;


@@ -4192,7 +4212,7 @@ Set to 1 to compile MS Windows XP theme engine support.
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_UXTHEME_AUTO</name>
                     <description>&lt;B&gt;MS Windows XP UX Theme Engine auto-adaptation&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_UXTHEME_AUTO</name>
                     <description>&lt;B&gt;MS Windows XP UX Theme Engine auto-adaptation&lt;/B&gt;&lt;P&gt;


@@ -4212,7 +4232,7 @@ Set to 1 to auto-adapt to MS Windows XP themes where possible
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>1</enabled>
                     <name>wxUSE_DC_CACHEING</name>
                     <description>Caches device contexts to improve performance.&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_DC_CACHEING</name>
                     <description>Caches device contexts to improve performance.&lt;P&gt;


@@ -4232,7 +4252,7 @@ Default: 1</description>
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">
                     <notes></notes>
                 </setting>
                 <setting type="bool-check">

-                    <active>0</active>
+                    <active>1</active>

                     <enabled>0</enabled>
                     <name>wxUSE_DIB_FOR_BITMAP</name>
                     <description>Set this to 1 to enable the use of DIB's for wxBitmap to support
                     <enabled>0</enabled>
                     <name>wxUSE_DIB_FOR_BITMAP</name>
                     <description>Set this to 1 to enable the use of DIB's for wxBitmap to support


@@ -4268,7 +4288,7 @@ Default: 0
                 <help-topic></help-topic>
                 <notes></notes>
                 <setting type="bool-check">
                 <help-topic></help-topic>
                 <notes></notes>
                 <setting type="bool-check">

-                    <active>1</active>
+                    <active>0</active>

                     <enabled>1</enabled>
                     <name>wxUSE_GTKTEST</name>
                     <description>&lt;B&gt;GTK+ test&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_GTKTEST</name>
                     <description>&lt;B&gt;GTK+ test&lt;/B&gt;&lt;P&gt;


@@ -4286,7 +4306,7 @@ Try to compile and run a test GTK program.</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_GTKPREFIX</name>
                     <description>&lt;B&gt;GTK+ prefix&lt;/B&gt;&lt;P&gt;
                     <enabled>0</enabled>
                     <name>wxUSE_GTKPREFIX</name>
                     <description>&lt;B&gt;GTK+ prefix&lt;/B&gt;&lt;P&gt;


@@ -4307,7 +4327,7 @@ Prefix where GTK+ is installed (optional). Type the prefix into the &lt;b&gt;val
 Type the prefix into the <B>value</B> property."></value>
                 </setting>
                 <setting type="bool-check">
 Type the prefix into the <B>value</B> property."></value>
                 </setting>
                 <setting type="bool-check">

-                    <active>1</active>
+                    <active>0</active>

                     <enabled>0</enabled>
                     <name>wxUSE_GTKEXECPREFIX</name>
                     <description>&lt;B&gt;GTK+ exec prefix&lt;/B&gt;&lt;P&gt;
                     <enabled>0</enabled>
                     <name>wxUSE_GTKEXECPREFIX</name>
                     <description>&lt;B&gt;GTK+ exec prefix&lt;/B&gt;&lt;P&gt;


@@ -4349,7 +4369,7 @@ Search for libiconv in DIR/include and DIR/lib. Type the prefix into the &lt;b&g
 Type the prefix into the <B>value</B> property."></value>
                 </setting>
                 <setting type="bool-check">
 Type the prefix into the <B>value</B> property."></value>
                 </setting>
                 <setting type="bool-check">

-                    <active>1</active>
+                    <active>0</active>

                     <enabled>1</enabled>
                     <name>wxUSE_X</name>
                     <description>&lt;B&gt;Use X&lt;/B&gt;&lt;P&gt;
                     <enabled>1</enabled>
                     <name>wxUSE_X</name>
                     <description>&lt;B&gt;Use X&lt;/B&gt;&lt;P&gt;

diff --git a/utils/configtool/docs/manual/configtool.tex b/utils/configtool/docs/manual/configtool.tex
index 5c513ef2e16785147aaec191ea1c47b20b5a8999..dc291680b9f5fd76f96430773be852cae3dd33d2 100644 (file)
--- a/utils/configtool/docs/manual/configtool.tex
+++ b/utils/configtool/docs/manual/configtool.tex
@@ -151,6 +151,15 @@ the licence files in the installation directory:
 
 \section{What's New?}\label{whatsnew}
 
 
 \section{What's New?}\label{whatsnew}
 

+{\bf Version 1.02, June 16th 2003}
+
+\begin{itemize}\itemsep=10pt
+\item The <b>Platform</b> group has been renamed
+<b>Target</b>, since there can be multiple targets
+per platform.
+\item The Windows/Universal target has been added.
+\end{itemize}
+

 {\bf Version 1.01, June 14th 2003}
 
 \begin{itemize}\itemsep=10pt
 {\bf Version 1.01, June 14th 2003}
 
 \begin{itemize}\itemsep=10pt


@@ -594,7 +603,7 @@ group and its children is considered to be a virtual
 taken into account if the option is a radio option
 or group. For each radio option, all other mutually
 exclusive options need to be listed. See the
 taken into account if the option is a radio option
 or group. For each radio option, all other mutually
 exclusive options need to be listed. See the

-{\bf Platform} group for an example of this.
+{\bf Target} group for an example of this.

 
 \section{How \ctshortname generates the configure commands}
 
 
 \section{How \ctshortname generates the configure commands}
 


@@ -623,7 +632,7 @@ by using the {\bf value} custom string property.
 
 \section{How \ctshortname generates the setup.h file}
 
 
 \section{How \ctshortname generates the setup.h file}
 

-The {\bf Platforms} group is ignored. In all other
+The {\bf Target} group is ignored. In all other

 cases, if the setting is prefixed by wxUSE_...
 and it's a boolean setting, \ctshortname will
 output 1 or 0 depending on the setting state.
 cases, if the setting is prefixed by wxUSE_...
 and it's a boolean setting, \ctshortname will
 output 1 or 0 depending on the setting state.

diff --git a/utils/configtool/docs/manual/tex2rtf.ini b/utils/configtool/docs/manual/tex2rtf.ini
index 27ab24f4894123ada1af49f511b73f8dfa888338..425dd56c97b9dde9a49f7d0a9165b193a57ff3f6 100644 (file)
--- a/utils/configtool/docs/manual/tex2rtf.ini
+++ b/utils/configtool/docs/manual/tex2rtf.ini
@@ -34,7 +34,7 @@ htmlFaceName = "Arial, Lucida, Helvetica"
 \ctgiftversiononly [1] {}
 %\ctgiftversiononly [1] {#1}
 \ctcustomversiononly [1] {#1}
 \ctgiftversiononly [1] {}
 %\ctgiftversiononly [1] {#1}
 \ctcustomversiononly [1] {#1}

-\ctversion [0] {1.01}
+\ctversion [0] {1.02}

 \ctname [0] {wxWindows Configuration Tool}
 \ctshortname [0] {Configuration Tool}
 \cttitle [0] {\ctname \ctversion}
 \ctname [0] {wxWindows Configuration Tool}
 \ctshortname [0] {Configuration Tool}
 \cttitle [0] {\ctname \ctversion}

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index e89e6640ec03581016176b37ee3d0ba2d7f2ddaf..3a50aadd83ef14d9a09c171bd674952fdf031946 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -639,7 +639,7 @@ void ctConfigToolDoc::GenerateSetup(ctConfigItem* item, wxString& str)
     wxString name = item->GetName();
 
     // We don't process the platform choice
     wxString name = item->GetName();
 
     // We don't process the platform choice

-    if (item->GetName() == wxT("Platform"))
+    if (item->GetName() == wxT("Target"))

         return;
 
     if (item->IsInActiveContext() &&
         return;
 
     if (item->IsInActiveContext() &&


@@ -689,8 +689,8 @@ wxString ctConfigToolDoc::GenerateConfigureCommand()
 
     str << path << wxT("configure");
 
 
     str << path << wxT("configure");
 

-    // Find the platform option to use
-    ctConfigItem* platformsFolder = GetTopItem()->FindItem(wxT("Platform"));
+    // Find the target to use
+    ctConfigItem* platformsFolder = GetTopItem()->FindItem(wxT("Target"));

     if (platformsFolder)
     {
         for ( wxNode* node = platformsFolder->GetChildren().GetFirst(); node; node = node->GetNext() )
     if (platformsFolder)
     {
         for ( wxNode* node = platformsFolder->GetChildren().GetFirst(); node; node = node->GetNext() )


@@ -714,7 +714,7 @@ void ctConfigToolDoc::GenerateConfigureCommand(ctConfigItem* item, wxString& str
 {
     // We don't process the platform group, since we've
     // already done so.
 {
     // We don't process the platform group, since we've
     // already done so.

-    if (item->GetName() == wxT("Platform"))
+    if (item->GetName() == wxT("Target"))

         return;
 
     if (item->IsInActiveContext() &&
         return;
 
     if (item->IsInActiveContext() &&

diff --git a/utils/configtool/src/symbols.h b/utils/configtool/src/symbols.h
index 8490e92163f7a5ace4f599f6da65c4e8f5fe74d8..2d0a0fe269cdedc17ef0aa4641a7218fc69e91fd 100644 (file)
--- a/utils/configtool/src/symbols.h
+++ b/utils/configtool/src/symbols.h
@@ -15,7 +15,7 @@
 //// Build settings
 
 // Version
 //// Build settings
 
 // Version

-#define ctVERSION_NUMBER            1.01
+#define ctVERSION_NUMBER            1.02

 
 // Whether to have a splash screen
 #define ctUSE_SPLASH_SCREEN         0
 
 // Whether to have a splash screen
 #define ctUSE_SPLASH_SCREEN         0