docstring fix

[wxWidgets.git] / docs / microwin / readme.txt

diff --git a/docs/microwin/readme.txt b/docs/microwin/readme.txt
index e916ced79455097180c49bebf18ac1632bd7b65f..2bc10af53d636fcc216678eea9aa863e343e3559 100644 (file)
--- a/docs/microwin/readme.txt
+++ b/docs/microwin/readme.txt
@@ -3,20 +3,26 @@ wxMicroWindows port
 
 Julian Smart 2001-12-08
 
-This is a port of wxWindows to MicroWindows, under Linux.
+This is a port of wxWidgets to MicroWindows, under Linux.
 Widgets are supplied by the wxUniversal project, while the
 underlying port uses the Windows ports with small modifications
 for the MicroWindows API.
 
+=== NOTE: ===
+
+  Current efforts are being concentrated on a port to Nano-X,
+  which potentially offers greater flexibility than the WIN32
+  API of MicroWindows, such as the ability to run multiple
+  Nano-X processes simultaneously. Please see
+  ../docs/x11/readme-nanox.txt for information.
+
 There are many things missing from MicroWindows that will
-make the port quite limited for the time being. I haven't
-worked out how to create bitmaps, though there is a BMP to C
-converter. There are no common dialogs (we will use generic ones),
-and only one WIN32 app may be run at a time.
+make the port quite limited for the time being.
+In particular, only one WIN32 app may be run at a time.
 
 Note that you can gain confidence in the WIN32/wxUniversal
 combination by compiling wxUniversal under Windows using VC++,
-using src/wxvc_universal.dsp. You can compile the minimal
+using src/wxUniv.dsp. You can compile the minimal
 and widgets samples in wxUniversal mode using the
 UnivDebug and UnivRelease targets. Most of the code is shared
 between this combination, and the wxMicroWindows port.
@@ -39,7 +45,7 @@ MicroWindows:
 
   Note: these are already applied by the patch below.
 
-- apply microwindows.patches (from wxWindows:
+- apply microwindows.patches (from wxWidgets:
   docs/microwin/microwindows.patches) to fix PeekMessage
   and other issues. If the patch doesn't apply automatically,
   you may need to apply it by hand, and the relevant changed
@@ -54,7 +60,7 @@ MicroWindows:
 
 wxMicroWindows:
 
-- Download wxMSW 2.3.2 or greater, or get it from CVS
+- Download wxMSW 2.3.4 or greater, or get it from CVS
 
 - Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if
   include/wx/setup.h doesn't exist
@@ -150,7 +156,7 @@ XPMs etc. Unfortunately the XPM routines are also #ifdefed
 for FILE_IO, even though for inline XPMs we don't need file I/O.
 (Embedded systems tend not to have file I/O, anyway.)
 
-Now, wxWindows has its own XPM decoder, src/common/xpmdecod.cpp,
+Now, wxWidgets has its own XPM decoder, src/common/xpmdecod.cpp,
 so in theory we don't need to use MicroWindows' code there.
 wxImage can load an inline XPM, _but_ we need to convert to
 a wxBitmap since this is what the widgets need.