diff --git a/contrib/samples/ogl/ogledit/Makefile b/contrib/samples/ogl/ogledit/Makefile
index 05f8941929..76d11a5ebb 100644
--- a/contrib/samples/ogl/ogledit/Makefile
+++ b/contrib/samples/ogl/ogledit/Makefile
@@ -16,7 +16,7 @@ CPP = gcc -g
 CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../lib
+WXLIB=-L../../../../lib -L../../../src/ogl
 
 OBJECTS=ogledit.o palette.o doc.o view.o
 
diff --git a/contrib/samples/ogl/studio/Makefile b/contrib/samples/ogl/studio/Makefile
index e94f1378c4..2070bc3b13 100644
--- a/contrib/samples/ogl/studio/Makefile
+++ b/contrib/samples/ogl/studio/Makefile
@@ -16,7 +16,7 @@ CPP = gcc -g
 CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../lib
+WXLIB=-L../../../../lib -L../../../src/ogl
 
 OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
 
diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index bfdb920f06..7d65694a9f 100644
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -227,7 +227,7 @@ FortyFrame::About(wxCommandEvent&)
 		"Forty Thieves\n\n"
 		"A freeware program using the wxWindows\n"
 		"portable C++ GUI toolkit.\n"
-		"http://web.ukonline.co.uk/julian.smart/wxwin\n"
+		"http://www.wxwindows.org\n"
 		"http://www.freiburg.linux.de/~wxxt\n\n"
 		"Author: Chris Breeze (c) 1992-1998\n"
 		"email: chris.breeze@iname.com",
diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index 0f646e2e32..67e11b68eb 100644
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -116,7 +116,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 	list->SetConstraints(layout);
 
 	wxString prevPlayer = m_scoreFile->GetPreviousPlayer();
-	if (prevPlayer.Length() > 0)
+	if ((prevPlayer.Length() > 0) && (list->FindString(prevPlayer) != -1))
 	{
 		list->SetStringSelection(prevPlayer);
 		m_textField->SetValue(prevPlayer);
diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 9417376437..27d375cc3c 100644
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -285,6 +285,7 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
 
     sizer2->Add( m_text, 0, wxGROW | wxTOP, 4 );
     sizer2->Add( slider, 0, wxCENTRE | wxALL, 4 );
+
     panel2->SetSizer( sizer2 );
     panel2->SetAutoLayout( TRUE );
     sizer2->Fit( panel2 );
diff --git a/distrib/msw/dialoged.rsp b/distrib/msw/dialoged.rsp
new file mode 100644
index 0000000000..f8fbdf3935
--- /dev/null
+++ b/distrib/msw/dialoged.rsp
@@ -0,0 +1,24 @@
+utils/dialoged/Makefile.in
+utils/dialoged/src/bitmaps/*.xbm
+utils/dialoged/src/bitmaps/*.xpm
+utils/dialoged/src/bitmaps/*.bmp
+utils/dialoged/src/bitmaps/*.ico
+utils/dialoged/src/*.h
+utils/dialoged/src/*.cpp
+utils/dialoged/src/*.def
+utils/dialoged/src/*.rc
+utils/dialoged/src/makefile*
+utils/dialoged/src/*.xbm
+utils/dialoged/src/*.xpm
+utils/dialoged/src/*.txt
+utils/dialoged/src/*.inf
+utils/dialoged/src/*.ico
+utils/dialoged/src/*.prj
+utils/dialoged/src/*.bmp
+
+docs/html/dialoged/*.htm
+docs/html/dialoged/*.gif
+docs/winhelp/dialoged.hlp
+docs/winhelp/dialoged.cnt
+docs/pdf/dialoged.pdf
+
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 59f5bcf43c..cbb02e741f 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -153,6 +153,8 @@ utils/configure.in
 utils/dialoged/Makefile.in
 utils/dialoged/src/bitmaps/*.xbm
 utils/dialoged/src/bitmaps/*.xpm
+utils/dialoged/src/bitmaps/*.bmp
+utils/dialoged/src/bitmaps/*.ico
 utils/dialoged/src/*.h
 utils/dialoged/src/*.cpp
 utils/dialoged/src/*.def
@@ -162,20 +164,9 @@ utils/dialoged/src/*.xbm
 utils/dialoged/src/*.xpm
 utils/dialoged/src/*.txt
 utils/dialoged/src/*.inf
-utils/dialoged/test/*.h
 utils/dialoged/src/*.ico
 utils/dialoged/src/*.prj
 utils/dialoged/src/*.bmp
-utils/dialoged/src/bitmaps/*.bmp
-utils/dialoged/src/bitmaps/*.ico
-utils/dialoged/test/*.cpp
-utils/dialoged/test/*.def
-utils/dialoged/test/*.rc
-utils/dialoged/test/makefile*
-utils/dialoged/lib/dummy
-utils/dialoged/test/*.ico
-utils/dialoged/test/*.prj
-utils/dialoged/test/*.bmp
 
 utils/hhp2cached/*.h
 utils/hhp2cached/*.cpp
@@ -258,6 +249,7 @@ samples/help/*.xbm
 samples/help/*.xpm
 samples/help/*.ico
 samples/help/*.bmp
+samples/help/*.gif
 samples/help/*.rc
 samples/help/*.hlp
 samples/help/*.cnt
@@ -599,6 +591,7 @@ samples/dnd/*.def
 samples/dnd/*.bmp
 samples/dnd/*.xbm
 samples/dnd/*.xpm
+samples/dnd/*.png
 samples/dnd/*.ico
 samples/dnd/*.txt
 
diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 92aefdc64e..a135c695bf 100755
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -26,6 +26,7 @@ erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
 erase %dest\jpeg.zip
 erase %dest\tiff.zip
+erase %dest\dialoged.zip
 
 if direxist %dest\wx deltree /Y %dest\wx
 
@@ -79,6 +80,12 @@ zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
 rem TIFF source
 zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
 
+rem Dialog Editor source and binary
+erase %dest\dialoged_source.zip
+zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
+zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\bin\dialoged.hlp %src\bin\dialoged.cnt
+erase %dest\dialoged_source.zip
+
 copy %src\docs\changes.txt %dest
 copy %src\docs\msw\install.txt %dest\install_msw.txt
 copy %src\docs\motif\install.txt %dest\install_motif.txt
diff --git a/docs/html/news.htm b/docs/html/news.htm
index ed9a244fa1..83822071ff 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -23,7 +23,7 @@ News
 <ul>
 <li><a href="download.htm" target=wxmain>wxWindows 2.1.14</a> is now available for Windows, Motif and GTK.
 Again, great strides have been made since the previous official version (2.1.11), and 2.2 will be the next official
-stable version. Many things have been fixed and added but <a href="newver.htm">here</a> are some highlights.
+stable version. Many things have been fixed and added but <a href="newver.htm">here are some highlights</a>.
 <li>Robin Dunn is contributing a wxStyledTextCtrl, a wrapper around the <a href="http://www.scintilla.org/" target=_new>Scintilla</a>
 styled text edit control. It can be used to provide syntax highlighting for various languages, and other applications.
 A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside wxWindows 2.1.14.
diff --git a/docs/html/platform.htm b/docs/html/platform.htm
index 3d97cfea0a..2b488ec6bc 100644
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -6,12 +6,26 @@
 </head>
 <body>
 
+<FONT FACE="Arial, Lucida Sans, Helvetica">
+
+<table align=center width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000" align=left colspan=2>
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+Supported Platforms
+</font>
+</td>
+</tr>
+</table>
+
+</p>
+
 You will find below the list of all supported platforms for different ports of wxWindows 2.x (wxMSW/wxGTK/wxMotif ports
 only). The cross icon in the third column doesn't mean that the platform is not supported, but just that wxWindows hasn't
 been tested on it recently (the table is being updated for wxWindows 2.1.14
 beta currently).
 <p>
-See also the <A HREF=daily/>daily rebuilds page</A> for some of the platforms mentioned below.
+See also the <A HREF="http://www.lpthe.jussieu.fr/~zeitlin/wxWindows/daily/">daily rebuilds page</A> for some of the platforms mentioned below.
 <p>
 If you have tested wxWindows on a platform not mentioned here, please tell us about your experience on our mailing list!
 We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX,
@@ -36,7 +50,7 @@ other flavours of BSD, ...
 <td bgcolor="#FFFFFF" align=center valign=center rowspan=6>Win32 (Windows 9x/NT)</td>
      <td>Visual C++ 4.2/5.x/6.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ, JS</td><td>Project files are provided for all versions except 4.2</td>
 <tr> <td>Borland C++ 5.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>Also works with free command line Borland C++ 5.5</td>
-<tr> <td>Myngw32</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
+<tr> <td>Mingw32</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
                                                                                                Version 2.95.2 recommended, otherwise some (included) patches must be applied<br>
                                                                                                Memory debugging code doesn't seem to work well</td>
 <tr> <td>Cygwin</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td>Hasn't been tested recently, anyone?</td>
@@ -99,8 +113,10 @@ other flavours of BSD, ...
 <br>
 
 <hr>
-Contact <A HREF="mailto:zeitlin@dptmaths.ens-cachan.fr">me</A> with
+Contact <A HREF="mailto:zeitlin@dptmaths.ens-cachan.fr">Vadim Zeitlin</A> with
 any comments/suggestions.
 
+</font>
+
 </body>
 </html>
diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex
index f2b31d88c5..d6faae4522 100644
--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -674,3 +674,4 @@ using this function.
 function to call, so it is not available for programmer use.  Call
 SortItems with a reference to a callable object that expects two
 parameters.}
+
diff --git a/docs/latex/wx/panel.tex b/docs/latex/wx/panel.tex
index f6469a0b0e..7d0a50ad7f 100644
--- a/docs/latex/wx/panel.tex
+++ b/docs/latex/wx/panel.tex
@@ -139,3 +139,4 @@ Changes the default button for the panel.
 \wxheading{See also}
 
 \helpref{GetDefaultItem}{wxpanelgetdefaultitem}
+
diff --git a/docs/motif/issues.txt b/docs/motif/issues.txt
index 743cbdb1e0..5bb2656c0e 100644
--- a/docs/motif/issues.txt
+++ b/docs/motif/issues.txt
@@ -1,15 +1,34 @@
 Outstanding issues
 ------------------
 
-(see also todo.txt)
+Last updated 19/3/2000.
+
+See also: todo.txt.
+
+- wxTextCtrl doesn't work as a stream buffer in Linux/gcc.
+
+- No wxSpinButton.
+
+- No wxToolTip (but see wxToolBar for a way of implementing it).
+
+- Limited clipboard support (text only) and no drag and drop.
 
-- wxTextCtrl doesn't work as a stream buffer in Linux/gcc
-- No wxSpinButton
 - Need a way of specifying default settings for colour/font/etc.
+
 - More optimisation could be done to reduce X server traffic, etc.
+
 - Should scrollbars take on the background colour? Not right for
   e.g. wxScrolledWindows, so maybe have wxSystemSettings value for
   scrollbar colour, and/or ability to set scrollbar colour independently.
+
 - wxFrame can accept events, but apps cannot draw into it for some reason,
   so the rotate sample won't work. Workaround: use an embedded wxWindow.
 
+- In Life! sample, text above slider isn't legible.
+
+- samples/html/helpview and samples/help show a problem when showing
+  the advanced HTML help controller: a BadDrawable X error occurs
+ (unfortunately hard to tell where). Somewhere in wxHtmlHelpFrame.
+
+- Dialog Editor needs a lot of work.
+
diff --git a/docs/readme.txt b/docs/readme.txt
index d324e57e35..c3f7ac1b6c 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -207,5 +207,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, March 2000
+The wxWindows Team, 19 March, 2000
 
diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 58533b813b..71eb3741c4 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -290,7 +290,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             // if the child window doesn't have a cursor, the
             // parent's (splitter window) will be used, and this
             // must be the standard cursor.
-            wxLogDebug("wxSplitterWindow: Setting to standard cursor");
 
             // where else do we unset the cursor?
             SetCursor(* wxSTANDARD_CURSOR);
diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp
index ba22dfe885..8ae04f8623 100644
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -67,7 +67,7 @@ void wxResourceTableWithSaving::OutputFont(wxTextOutputStream& stream, const wxF
  
 bool wxResourceTableWithSaving::Save(const wxString& filename)
 {
-  wxFileOutputStream file_output( filename.fn_str() );
+  wxFileOutputStream file_output( filename );
   if (file_output.LastError())
     return FALSE;