diff --git a/utils/configtool/configs/wxwin250.wxs b/utils/configtool/configs/wxwin250.wxs
index 6a2d9fb41f..907b9ad6df 100644
--- a/utils/configtool/configs/wxwin250.wxs
+++ b/utils/configtool/configs/wxwin250.wxs
@@ -18,8 +18,10 @@
1
0
- Platform
- <B>Choose a platform</B>
+ Target
+ <B>Choose a target</B><P>
+
+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).
1
@@ -36,14 +38,32 @@
Windows
<B>The WIN32 port.</B><P>
-This port is for Windows 9x, ME, NT, 2K, XP.
+This port is for Windows 9x, ME, NT, 2K, XP, using the native widgets.
1
- MGL,X11,Mac Carbon,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine
+ MGL,X11,Mac Carbon,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal
+
+ --with-msw
+
+
+
+
+ 1
+ 1
+ Windows/Universal
+ <b>Windows/Universal</b><P>
+
+A port for MS Windows, using the wxUniversal widget set.
+ 1
+
+
+
+
+ GTK+ 1.x,GTK+ 2.x,Mac Carbon,Mac Cocoa,MGL,Motif,OS/2,Windows,Wine,X11
--with-msw
@@ -62,7 +82,7 @@ This port is based on the wxUniversal widgets.
- MGL,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine
+ MGL,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal
--with-x11
@@ -81,7 +101,7 @@ A port for Mac OS 9 and Mac OS 10.x.
- MGL,X11,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine
+ MGL,X11,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal
--with-mac
@@ -99,7 +119,7 @@ This port uses the Cocoa API on Mac OS X.
- GTK+ 2.x,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11
+ GTK+ 2.x,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11,Windows/Universal
--with-cocoa
@@ -118,7 +138,7 @@ This port is based on the GTK+ 1.x and 2.x widget set.
- MGL,X11,Mac Carbon,Windows,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine
+ MGL,X11,Mac Carbon,Windows,Motif,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal
--with-gtk
@@ -126,7 +146,7 @@ This port is based on the GTK+ 1.x and 2.x widget set.
1
- 1
+ 0
GTK+ 2.x
<B>wxGTK with GTK+ 2</B><P>
@@ -136,7 +156,7 @@ This port uses GTK+ 2.
- Mac Cocoa,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11
+ Mac Cocoa,GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,OS/2,Wine,X11,Windows/Universal
--with-gtk2
@@ -155,7 +175,7 @@ This port uses Motif 1.x/2.x or Lesstif.
- MGL,X11,Mac Carbon,Windows,GTK+ 1.x,OS/2,Mac Cocoa,GTK+ 2.x,Wine
+ MGL,X11,Mac Carbon,Windows,GTK+ 1.x,OS/2,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal
--with-motif
@@ -173,7 +193,7 @@ This port uses OS/2 Presentation Manager.
- GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,X11,Mac Cocoa,GTK+ 2.x,Wine
+ GTK+ 1.x,Mac Carbon,MGL,Motif,Windows,X11,Mac Cocoa,GTK+ 2.x,Wine,Windows/Universal
--with-pm
@@ -191,7 +211,7 @@ The wxMSW port built for Wine (Windows emulation library).
- Mac Cocoa,GTK+ 1.x,GTK+ 2.x,Mac Carbon,MGL,Motif,Windows,OS/2,X11
+ Mac Cocoa,GTK+ 1.x,GTK+ 2.x,Mac Carbon,MGL,Motif,Windows,OS/2,X11,Windows/Universal
--with-wine
@@ -209,7 +229,7 @@ This port is based on the wxUniversal widgets.
- X11,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,Wine,GTK+ 2.x
+ X11,Mac Carbon,Windows,GTK+ 1.x,Motif,OS/2,Mac Cocoa,Wine,GTK+ 2.x,Windows/Universal
--with-mgl
@@ -253,13 +273,13 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
0
- 0
+ 1
__WXMSW__
This is enabled if the relevant platform settings are enabled.
1
- Windows,Wine
+ Windows,Wine,Windows/Universal
- Windows,Wine
+ Windows,Wine,Windows/Universal
@@ -269,7 +289,7 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
0
- 1
+ 0
__WXGTK__
This is enabled if the relevant platform settings are enabled.
@@ -286,7 +306,7 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
0
- 1
+ 0
__WXGTK20__
This is enabled if the relevant platform settings are enabled.
@@ -405,14 +425,14 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
0
- 0
+ 1
__WXUNIVERSAL__
This is enabled if the relevant platform settings are enabled.
1
- X11,MGL
+ X11,MGL,Windows/Universal
- X11,MGL
+ X11,MGL,Windows/Universal
@@ -421,8 +441,8 @@ If on, builds a GUI version of the library as opposed to wxBase. Currently, this
- 1
- 0
+ 0
+ 1
wxUSE_UNIVERSAL
<B>Universal</B><P>
@@ -430,13 +450,13 @@ Specifies if wxUniversal should be used instead of native widgets.<P>
If the selected port in <B>Platform</B> 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.
0
-
+ __WXUNIVERSAL__
__WXUNIVERSAL__
-
+ --enable-universal
@@ -802,7 +822,7 @@ Recommended setting: 0 (please update your code)
- 0
+ 1
1
wxFONT_SIZE_COMPATIBILITY
<B>Define as 1 for font size to be backward compatible to 1.63 and earlier.</B><P>
@@ -823,7 +843,7 @@ Default is 0.
- 0
+ 1
1
wxDIALOG_UNIT_COMPATIBILITY
<B>Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.</B><P>
@@ -958,7 +978,7 @@ Default: 0. Recommended setting: 0
- 0
+ 1
1
wxUSE_ON_FATAL_EXCEPTION
<B>Fatal exceptions handling</B><P>
@@ -2542,7 +2562,7 @@ This class is needed by wxNotebook, wxTreeCtrl and wxListCtrl.
- 0
+ 1
1
wxUSE_METAFILE
<B>wxMetaFile</B><P>
@@ -2568,7 +2588,7 @@ Recommended setting: default or 0 for everything for portable programs.
wxMetaFile
- 0
+ 1
1
wxUSE_ENH_METAFILE
<B>wxEnhMetaFile</B><P>
@@ -2586,7 +2606,7 @@ Enhanced metafile (recommended).
- 0
+ 1
1
wxUSE_WIN_METAFILES_ALWAYS
This option is obsolete. Set to 0.
@@ -2807,7 +2827,7 @@ Set to 1 for XPM format support.
- 0
+ 1
1
wxUSE_ICO_CUR
<B>MS Windows icons and cursors support</B><P>
@@ -3769,7 +3789,7 @@ Default: 1.
wxHelpController
- 0
+ 1
1
wxUSE_MS_HTML_HELP
<B>MS HTML Help</B><P>
@@ -3844,7 +3864,7 @@ Settings for various input devices.
- 0
+ 1
1
wxUSE_MOUSEWHEEL
<B>Mousewheel support</B><P>
@@ -4069,7 +4089,7 @@ Default: 0
- 0
+ 1
1
wxUSE_OWNER_DRAWN
<B>Owner-drawn controls</B><P>
@@ -4090,7 +4110,7 @@ Default: 1. Recommended setting: 1, set to 0 for a small library size reduction.
- 0
+ 1
1
wxUSE_RICHEDIT
<B>Rich edit control support</B><P>
@@ -4111,7 +4131,7 @@ Default: 1 for compilers which support it Recommended setting: 1, only set it t
- 0
+ 1
1
wxUSE_RICHEDIT2
<B>Rich edit control version 2</B><P>
@@ -4131,7 +4151,7 @@ Default: 1
- 0
+ 1
0
wxUSE_MFC
<B>MFC interoperation</B><P>
@@ -4152,7 +4172,7 @@ Default: 0. Recommended setting: 0 unless you really have to use MFC
- 0
+ 1
1
wxUSE_OLE
<B>OLE support</B><P>
@@ -4173,7 +4193,7 @@ Default: 1. Recommended setting: 1
- 0
+ 1
1
wxUSE_UXTHEME
<B>MS Windows XP UX Theme Engine support</B><P>
@@ -4192,7 +4212,7 @@ Set to 1 to compile MS Windows XP theme engine support.
- 0
+ 1
1
wxUSE_UXTHEME_AUTO
<B>MS Windows XP UX Theme Engine auto-adaptation</B><P>
@@ -4212,7 +4232,7 @@ Set to 1 to auto-adapt to MS Windows XP themes where possible
- 0
+ 1
1
wxUSE_DC_CACHEING
Caches device contexts to improve performance.<P>
@@ -4232,7 +4252,7 @@ Default: 1
- 0
+ 1
0
wxUSE_DIB_FOR_BITMAP
Set this to 1 to enable the use of DIB's for wxBitmap to support
@@ -4268,7 +4288,7 @@ Default: 0
- 1
+ 0
1
wxUSE_GTKTEST
<B>GTK+ test</B><P>
@@ -4286,7 +4306,7 @@ Try to compile and run a test GTK program.
- 1
+ 0
0
wxUSE_GTKPREFIX
<B>GTK+ prefix</B><P>
@@ -4307,7 +4327,7 @@ Prefix where GTK+ is installed (optional). Type the prefix into the <b>val
Type the prefix into the value property.">
- 1
+ 0
0
wxUSE_GTKEXECPREFIX
<B>GTK+ exec prefix</B><P>
@@ -4349,7 +4369,7 @@ Search for libiconv in DIR/include and DIR/lib. Type the prefix into the <b&g
Type the prefix into the value property.">
- 1
+ 0
1
wxUSE_X
<B>Use X</B><P>
diff --git a/utils/configtool/docs/manual/configtool.tex b/utils/configtool/docs/manual/configtool.tex
index 5c513ef2e1..dc291680b9 100644
--- 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}
+{\bf Version 1.02, June 16th 2003}
+
+\begin{itemize}\itemsep=10pt
+\item The Platform group has been renamed
+Target, 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
@@ -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
-{\bf Platform} group for an example of this.
+{\bf Target} group for an example of this.
\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}
-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.
diff --git a/utils/configtool/docs/manual/tex2rtf.ini b/utils/configtool/docs/manual/tex2rtf.ini
index 27ab24f489..425dd56c97 100644
--- 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}
-\ctversion [0] {1.01}
+\ctversion [0] {1.02}
\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 e89e6640ec..3a50aadd83 100644
--- 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
- if (item->GetName() == wxT("Platform"))
+ if (item->GetName() == wxT("Target"))
return;
if (item->IsInActiveContext() &&
@@ -689,8 +689,8 @@ wxString ctConfigToolDoc::GenerateConfigureCommand()
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() )
@@ -714,7 +714,7 @@ void ctConfigToolDoc::GenerateConfigureCommand(ctConfigItem* item, wxString& str
{
// 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() &&
diff --git a/utils/configtool/src/symbols.h b/utils/configtool/src/symbols.h
index 8490e92163..2d0a0fe269 100644
--- a/utils/configtool/src/symbols.h
+++ b/utils/configtool/src/symbols.h
@@ -15,7 +15,7 @@
//// Build settings
// Version
-#define ctVERSION_NUMBER 1.01
+#define ctVERSION_NUMBER 1.02
// Whether to have a splash screen
#define ctUSE_SPLASH_SCREEN 0