Version numbering change, small additions to ToDo

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

diff --git a/docs/html/roadmap.htm b/docs/html/roadmap.htm
index b50d71b19a836587e5c53d7503fb7b43ebce5645..d6a4ec290a2f85279800762f50d1c2c7c18bbb2f 100644 (file)
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -35,7 +35,8 @@ Note (1): as the wxWindows effort is voluntary, these are not hard-and-fast dead
 but we will endeavour to follow them as closely as possible.<P>
 
 Note (2): the releases described are for wxGTK, wxMSW and wxMotif ports. wxMac currently follows
-its own development path. Also, minor snapshot releases for specific platforms may be
+its own development path but is due to merge with the main code base in November/December.
+Also, minor snapshot releases for specific platforms may be
 available at dates convenient to the developers.<P>
 
 <CENTER>
@@ -43,7 +44,7 @@ available at dates convenient to the developers.<P>
 </CENTER>
 <P>
 
-<H4>Release 2.1.10</H4>
+<H4>Release 2.0.?</H4>
 
 <ul>
 <li>Release date: October 3rd, 1999
@@ -54,7 +55,7 @@ is split into base and GUI libraries.
 
 <P>
 
-<H2>Release 2.1.11 (final)</H2>
+<H2>Release 2.1</H2>
 
 <ul>
 <li>Release date: November 7th, 1999
@@ -73,7 +74,7 @@ combined base/GUI library for GUI applications only.
 
 <P>
 
-<H4>Release 2.1.12</H4>
+<H4>Release 2.1.1</H4>
 
 <ul>
 <li>Release date: January 9th, 2000
@@ -82,7 +83,7 @@ combined base/GUI library for GUI applications only.
 
 <P>
 
-<H4>Release 2.1.13</H4>
+<H4>Release 2.1.2</H4>
 
 <ul>
 <li>Release date: March 5th, 2000
@@ -92,7 +93,7 @@ combined base/GUI library for GUI applications only.
 
 <P>
 
-<H4>Release 2.2.0</H4>
+<H4>Release 2.1.3</H4>
 
 <ul>
 <li>Release date: May 7th, 2000
@@ -101,7 +102,7 @@ combined base/GUI library for GUI applications only.
 
 <P>
 
-<H2>Release 2.2.x (final)</H2>
+<H2>Release 2.2</H2>
 
 <ul>
 <li>Release date: c. July 2nd, 2000
@@ -111,7 +112,7 @@ combined base/GUI library for GUI applications only.
 
 <P>
 
-<H2>Release 2.3.x (final)</H2>
+<H2>Release 2.3</H2>
 
 <ul>
 <li>Release date: unknown
@@ -141,17 +142,22 @@ applications), console (classes and functions usable by console application only
 and GUI (classes and functions usable by GUI application only).
 <li>Extend and unify drag and drop handling (e.g. we need to specify multiple drop targets
 that can handle multiple formats).
-<li>Expand the number of controls that can be specified in a WXR file.
+<li>Expand the number of controls that can be specified in a WXR file;
+add constraint specification to WXR syntax and Dialog Editor; add multilanguage support to WXR.
 <li>Rewrite Dialog Editor.
 <li>PCX writing code.
 <li>GIF animation code.
 <li>Tidying of timer code, addition of wxChrono class.
+<li>Debug wxPostScriptDC further.
 <li>wxDateTime class.
+<li>Expansion of wxHTML to support further tags, and frames.
 <li>MGL port (see Backroom/Future Ports page).
 <li>Rotated text support.
 <li>FreeType support.
 <li>Support for 'skins', perhaps using a set of alternative control and window classes
 written generically in wxWindows.
+<li>Serial and parallel port support.
+<li>Modem and telephony support.
 <li>Book, tutorial.
 <li>More examples.
 </ul>