diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index faf359bce6..44062e55a7 100644
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -24,66 +24,67 @@ cd $1
 echo Removing backup files...
 rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
-rm -f $2/wxgtk.tar.gz
-rm -f $2/wxmotif.tar.gz
-rm -f $2/wxdocsrc.tar.gz
-rm -f $2/wxhtml.tar.gz
-rm -f $2/wxpdf.tar.gz
-rm -f $2/wxstubs.tar.gz
-rm -f $2/tex2rtf.tar.gz
-rm -f $2/ogl.tar.gz
-rm -f $2/wxtree.tar.gz
+rm -f $2/wx200*.tgz
+rm -f $2/tex2rtf2.tgz
+rm -f $2/ogl3.tgz
+rm -f $2/treedraw.tar.gz
 rm -f $2/glcanvas.tar.gz
 
 echo Tarring...
 
+### Generic
+ls `cat $1/distrib/msw/generic.rsp` > /tmp/wxgen.txt
+tar cvf $2/wx200gen.tar -T /tmp/wxgen.txt
+gzip $2/wx200gen.tar
+mv $2/wx200gen.tar.gz $2/wx200gen.tgz
+
 ### wxGTK
 ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp` > /tmp/wxgtk.txt
-tar cvf $2/wxgtk.tar -T /tmp/wxgtk.txt
-gzip $2/wxgtk.tar
-mv $2/wxgtk.tar.gz $2/wxgtk.tgz
+tar cvf $2/wx200gtk.tar -T /tmp/wxgtk.txt
+gzip $2/wx200gtk.tar
+mv $2/wx200gtk.tar.gz $2/wx200gtk.tgz
 
 ### wxMotif
 ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp` > /tmp/wxmotif.txt
-tar cvf $2/wxmotif.tar -T /tmp/wxmotif.txt
-gzip $2/wxmotif.tar
-mv $2/wxmotif.tar.gz $2/wxmotif.tgz
+tar cvf $2/wx200mot.tar -T /tmp/wxmotif.txt
+gzip $2/wx200mot.tar
+mv $2/wx200mot.tar.gz $2/wx200mot.tgz
 
 ### Doc sources
 ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
-tar cvf $2/wxdocsrc.tar -T /tmp/docsrc.txt
-gzip $2/wxdocsrc.tar
-mv $2/wxdocsrc.tar.gz $2/wxdocsrc.tgz
+tar cvf $2/wx200doc.tar -T /tmp/docsrc.txt
+gzip $2/wx200doc.tar
+mv $2/wx200doc.tar.gz $2/wx200doc.tgz
 
 ### HTML docs
 ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
-tar cvf $2/wxhtml.tar -T /tmp/html.txt
-gzip $2/wxhtml.tar
-mv $2/wxhtml.tar.gz $2/wxhtml.tgz
+tar cvf $2/wx200htm.tar -T /tmp/html.txt
+gzip $2/wx200htm.tar
+mv $2/wx200htm.tar.gz $2/wx200htm.tgz
 
 ### PDF docs
 ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
-tar cvf $2/wxpdf.tar -T /tmp/pdf.txt
-gzip $2/wxpdf.tar
-mv $2/wxpdf.tar.gz $2/wxpdf.tgz
+tar cvf $2/wx200pdf.tar -T /tmp/pdf.txt
+gzip $2/wx200pdf.tar
+mv $2/wx200pdf.tar.gz $2/wx200pdf.tgz
 
 ### Stubs files
 ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
-tar cvf $2/wxstubs.tar -T /tmp/stubs.txt
-gzip $2/wxstubs.tar
-mv $2/wxstubs.tar.gz $2/wxstubs.tgz
+tar cvf $2/wx200stubs.tar -T /tmp/stubs.txt
+gzip $2/wx200stubs.tar
+mv $2/wx200stubs.tar.gz $2/wx200stubs.tgz
 
 ### Tex2RTF
 ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
-tar cvf $2/tex2rtf.tar -T /tmp/tex2rtf.txt
-gzip $2/tex2rtf.tar
-mv $2/tex2rtf.tar.gz $2/tex2rtf.tgz
+tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
+gzip $2/tex2rtf2.tar
+mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
 
 ### OGL
 ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
-tar cvf $2/ogl.tar -T /tmp/ogl.txt
-gzip $2/ogl.tar
-mv $2/ogl.tar.gz $2/ogl.tgz
+tar cvf $2/ogl3.tar -T /tmp/ogl.txt
+gzip $2/ogl3.tar
+mv $2/ogl3.tar.gz $2/ogl3.tgz
 
 ### wxGLCanvas
 ls `cat $1/distrib/msw/glcanvas.rsp` > /tmp/glcanvas.txt
@@ -93,8 +94,8 @@ mv $2/glcanvas.tar.gz $2/glcanvas.tgz
 
 ### wxTreeLayout
 ls `cat $1/distrib/msw/wxtree.rsp` > /tmp/wxtree.txt
-tar cvf $2/wxtree.tar -T /tmp/wxtree.txt
-gzip $2/wxtree.tar
-mv $2/wxtree.tar.gz $2/wxtree.tgz
+tar cvf $2/treedraw.tar -T /tmp/wxtree.txt
+gzip $2/treedraw.tar
+mv $2/treedraw.tar.gz $2/treedraw.tgz
 
 echo Done!
diff --git a/docs/changes.txt b/docs/changes.txt
index 25287c316a..4361ed5d79 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -13,6 +13,7 @@ wxMSW:
 
 - Fixed problems with <return> in dialogs/panels.
 - Fixed window cursor setting.
+- Fixed toolbar sizing and edge-clipping problems.
 - Some makefile fixes.
 
 wxMotif:
diff --git a/docs/html/index.htm b/docs/html/index.htm
index be88c494e3..00d0d0afd5 100644
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -5,7 +5,8 @@
 
 </HEAD>
 
-<BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+<!BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
+<BODY BGCOLOR="#CCDDDFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
 
 <font face="Arial, Lucida Sans, Helvetica">
 
@@ -24,9 +25,9 @@
 
 <P>
 
-Welcome to wxWindows 2, the premiere cross-platform GUI C++ framework. This is an index of
-the plain text and HTML documentation. Documentation is also available in Acrobat (PDF) and Windows Help,
-from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
+Welcome to wxWindows 2, the premi&egrave;re cross-platform GUI C++ framework. This is an index of
+the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've
+downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
 
 <CENTER>
 <FONT size=-1>
@@ -37,9 +38,7 @@ from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
 </FONT>
 </CENTER>
 
-<hr>
-
-<h3><a name="install">Installation and release notes</a></h3>
+<h3 align=center><a name="install"><hr>Installation and release notes<hr></a></h3>
 
 <ul>
 <li>ReadMe: <a href="../readme.txt"><b>General ReadMe</b></a>,
@@ -71,33 +70,118 @@ from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P>
 <li>List of <a href="../symbols.txt">preprocessor symbols</a> used in wxWindows
 </ul>
 
-<hr>
+<h3 align=center><a name="manuals"><hr>wxWindows manuals<hr></a></h3>
+
+<table border=1 align=center>
+
+<tr>
+<td align=center bgcolor="#FFFF00">
+<B>HTML</B>
+</td>
+<td align=center bgcolor="#FFFF00">
+<B>WinHelp</B>
+</td>
+<td align=center bgcolor="#FFFF00">
+<B>PDF</B>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="wx/wx.htm">Reference Manual</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/wx.hlp">Reference Manual</a>
+</td>
+
+<td align=center>
+<a href="../pdf/wx.pdf">Reference Manual</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="porting/port.htm">Porting Guide</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/porting.hlp">Porting Guide</a>
+</td>
+
+<td align=center>
+<a href="../pdf/porting.pdf">Porting Guide</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="dialoged/dlged.htm">Dialog Editor Manual</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/dialoged.hlp">Dialog Editor Manual</a>
+</td>
+
+<td align=center>
+<a href="../pdf/dialoged.pdf">Dialog Editor Manual</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="proplist/prop.htm">Property List Classes</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/proplist.hlp">Propert List Classes</a>
+</td>
+
+<td align=center>
+<a href="../pdf/proplist.pdf">Property List Classes</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="wxtree/tree.htm">wxTreeLayout Class</a>
+</td>
+
+<td align=center>
+<a href="../winhelp/wxtree.hlp">wxTreeLayout Class</a>
+</td>
+
+<td align=center>
+<a href="../pdf/wxtree.pdf">wxTreeLayout Class</a>
+</td>
+</tr>
+
+<tr>
+<td align=center>
+<a href="odbc/odbc.htm">Remstar ODBC Classes</a>
+</td>
+
+<td align=center>
+<BR><BR>
+</td>
+
+<td align=center>
+<a href="../pdf/odbc.pdf">Remstar ODBC Classes</a>
+</td>
+</tr>
+
+</table>
 
 
-<h3><a name="manuals">wxWindows manuals</a></h3>
+<h3 align=center><a name="thirdparty"><hr>Third-party tools<hr></a></h3>
 
 <ul>
-<li><a href="wx/wx.htm">Reference Manual</a>
-<li><a href="porting/port.htm">Porting Guide</a> (wxWindows 1.xx to 2)
-<li><a href="dialoged/dlged.htm">Dialog Editor</a>
-<li><a href="proplist/prop.htm">Property List Classes</a>
-<li><a href="wxtree/tree.htm">wxTreeLayout</a>
-<li><a href="odbc/odbc.htm">Remstar ODBC Classes</a>
+<li><a href="gettext/gettext.htm">gettext Manual</a>
+<li><a href="gettext/xgettext.htm">xgettext Manual</a>
+<li><a href="gettext/msgfmt.htm">msgfmt Manual</a>
 </ul>
 
-<hr>
-
-<h3><a name="thirdparty">Third-party tools</a></h3>
-
-<ul>
-<li><a href="gettext/gettext.htm">gettext manual</a>
-<li><a href="gettext/xgettext.htm">xgettext manual</a>
-<li><a href="gettext/msgfmt.htm">msgfmt manual</a>
-</ul>
-
-<hr>
-
-<h3><a name="samples">Samples</a></h3>
+<h3 align=center><a name="samples"><hr>Samples<hr></a></h3>
 
 <ul>
 <li><a href="../../samples/bombs">bombs</a>: minesweeper-like game.
diff --git a/docs/html/logo.gif b/docs/html/logo.gif
index 62b41f0f10..2242fffd96 100644
Binary files a/docs/html/logo.gif and b/docs/html/logo.gif differ
diff --git a/docs/latex/porting/porting.tex b/docs/latex/porting/porting.tex
index b786ea614d..6729f323eb 100644
--- a/docs/latex/porting/porting.tex
+++ b/docs/latex/porting/porting.tex
@@ -14,7 +14,7 @@
 \parindent=0pt
 \title{Guide to porting applications from wxWindows 1.xx to 2.0}
 \author{Julian Smart}
-\date{October 1997}
+\date{March 1999}
 \makeindex
 \begin{document}
 \maketitle
diff --git a/docs/readme.txt b/docs/readme.txt
index bd82c3aaef..78a3583732 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -6,14 +6,14 @@ framework for writing advanced GUI applications using (where
 possible) the native controls.
 
 In addition to common and advanced GUI facilities such as frames, scrolling
-windows, toolbars, tree controls, icons, device contexts,
-printing, splitter windows and so on, there are wrappers for common
-file operations and facilities for writing TCP/IP applications.
+windows, toolbars, tree controls, icons, device contexts, printing,
+splitter windows and so on, there are wrappers for common file operations,
+and facilities for writing TCP/IP applications, thread handling, and more.
 Where certain features are not available on a platform, such as MDI and
 tree controls on Unix, they are emulated.
 
 A detailed 700-page reference manual is supplied in HTML, PDF and
-Windows Help form.
+Windows Help form: see the docs hierarchy.
 
 For a quick start, point your Web browser at docs/html/index.htm for a list of
 important documents and samples.
@@ -43,7 +43,7 @@ wx200msw.zip            Windows-specific source code
 wx200mot.zip            Motif-specific source code
 wx200gtk.zip            GTK-specific source code
 wx200stubs.zip          Stubs ('empty port') source. Needs
-                        wx200gen.zip/wxgen.tgz.
+                        wx200gen.zip/tgz.
 wx200doc.zip            Documentation source code (not required)
 wx200hlp.zip            WinHelp documentation
 wx200pdf.zip            Acrobat PDF documentation
@@ -56,14 +56,14 @@ The tarred, gzip archive comprises the following (or similar
 names). Not all of these files are available in all distributions, due
 to space restrictions.
 
-wxgtk.tgz               All wxGTK source and samples
-wxmotif.tgz             All wxMotif source and samples
-wxstubs.tgz             Stubs ('empty port') source. Needs
-                        wx200gen.zip/wxgen.tgz.
-wxgen.tgz               Generic code and samples (common to all ports)
-wxpdf.tgz               Acrobat PDF documentation
-wxhtml.tgz              HTML documentation
-wxdocsrc.tgz            Documentation source
+wx200gtk.tgz            All wxGTK source and samples
+wx200mot.tgz            All wxMotif source and samples
+wx200stubs.tgz          Stubs ('empty port') source. Needs
+                        wx200gen.zip/tgz.
+wx200gen.tgz            Generic code and samples (common to all ports)
+wx200pdf.tgz            Acrobat PDF documentation
+wx200htm.tgz            HTML documentation
+wx200src.tgz            Documentation source
 
 Installation
 ------------
@@ -131,5 +131,5 @@ or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, February 1999
+The wxWindows Team, March 1st, 1999
 
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 46a3e5f7eb..b0b0c19a6d 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -111,7 +111,11 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     wxSashEdgePosition sashHit = SashHitTest(x, y);
 
     // reset the cursor
+#ifdef __WXMOTIF__
+    SetCursor(* wxSTANDARD_CURSOR);
+#else
     SetCursor(wxCursor());
+#endif
 
 	if (event.LeftDown())
 	{
diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 44243d300b..f5e8b79855 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -146,7 +146,11 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     event.Position(&x, &y);
 
     // reset the cursor
+#ifdef __WXMOTIF__
+    SetCursor(* wxSTANDARD_CURSOR);
+#else
     SetCursor(wxCursor());
+#endif
 
     if (event.LeftDown())
     {
diff --git a/src/motif.inc b/src/motif.inc
index 169888d98c..1fb0422186 100644
--- a/src/motif.inc
+++ b/src/motif.inc
@@ -75,6 +75,7 @@ LIB_CPP_SRC=\
  motif/brush.cpp \
  motif/button.cpp \
  motif/checkbox.cpp \
+ motif/checklst.cpp \
  motif/choice.cpp \
  motif/clipbrd.cpp \
  motif/colour.cpp \
diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index f880ecaf45..bbd6915e8e 100644
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -60,13 +60,13 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 // check items
 // -----------
 
-bool wxCheckListBox::IsChecked(uint uiIndex) const
+bool wxCheckListBox::IsChecked(size_t uiIndex) const
 {
     // TODO
     return FALSE;
 }
 
-void wxCheckListBox::Check(uint uiIndex, bool bCheck)
+void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
 {
     // TODO
 }
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 1cad5adba2..bace16b9f9 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -133,7 +133,7 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height) const
 {
-    wxWindow::GetClientSize(width, height);
+    wxFrame::GetClientSize(width, height);
 }
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)

+HTML +	+WinHelp +	+PDF +
+Reference Manual +	+Reference Manual +	+Reference Manual +
+Porting Guide +	+Porting Guide +	+Porting Guide +
+Dialog Editor Manual +	+Dialog Editor Manual +	+Dialog Editor Manual +
+Property List Classes +	+Propert List Classes +	+Property List Classes +
+wxTreeLayout Class +	+wxTreeLayout Class +	+wxTreeLayout Class +
+Remstar ODBC Classes +	+ +	+Remstar ODBC Classes +