diff --git a/docs/latex/wx/tlog.tex b/docs/latex/wx/tlog.tex
index 0024fcabc4..22c9b78ceb 100644
--- a/docs/latex/wx/tlog.tex
+++ b/docs/latex/wx/tlog.tex
@@ -72,7 +72,7 @@ printf()}.
 Moreover {\it wxMSW} doesn't have a {\bf console} as you may have with {\it
   wxGTK}. Under {\it wxMSW}, a call using {\it cout} just goes nowhere. To
 cope with this problem, {\it wxWindows} provides a way to redirect {\it cout}
-calls to \helpref{wxTreeCtrl}{wxtreectrl}, {\it i.e.}:
+calls to \helpref{wxTextCtrl}{wxtextctrl}, {\it i.e.}:
 {\small
 \begin{verbatim}
   wxLogWindow *logger=new wxLogWindow(your_frame,"Logger");
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index ecabe808de..43969c4bd8 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -653,6 +653,8 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
+    wxBusyCursor busy;
+
     int canvasWidth, canvasHeight;
 
     if (!m_previewCanvas)
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 5b7b091815..a808264d02 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -476,9 +476,9 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
             }
             else
             {
-                // Draw a light grey line on the right to indicate that the
+                // Draw a highlight line on the right to indicate that the
                 // sash is raised
-                dc.SetPen(lightShadowPen);
+                dc.SetPen(hilightPen);
                 dc.DrawLine(w - GetEdgeMargin(edge), 0, w - GetEdgeMargin(edge), h);
             }
         }
@@ -499,9 +499,9 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
         {
             if (edge == wxSASH_BOTTOM)
             {
-                // Draw a light grey line on the bottom to indicate that the
+                // Draw a highlight line on the bottom to indicate that the
                 // sash is raised
-                dc.SetPen(lightShadowPen);
+                dc.SetPen(hilightPen);
                 dc.DrawLine(0, h - GetEdgeMargin(edge), w, h - GetEdgeMargin(edge));
             }
             else
diff --git a/src/makeb32.env b/src/makeb32.env
index efa659c959..fec3d1afce 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -13,8 +13,8 @@ WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 # Ilink32 is available on BC++ 5.02 and above, and all
 # versions of C++ Builder.
 !ifndef LINK
-#LINK=ilink32
-LINK=tlink32
+LINK=ilink32
+#LINK=tlink32
 !endif
 
 !ifndef FINAL
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 603f152158..d20c519a67 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -20,18 +20,19 @@
 #pragma hdrstop
 #endif
 
+#include "wx/defs.h"
+
+// Watcom C++ gives a linker error if this is compiled in.
+// With Borland C++, all samples crash if this is compiled in.
+#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
+
 #include "wx/log.h"
+#include "wx/msw/ole/automtn.h"
+#include "wx/msw/private.h"
 
 #include <math.h>
 #include <time.h>
 
-// Watcom C++ gives a linker error if this is compiled in.
-#ifndef __WATCOMC__
-
-#include "wx/msw/ole/automtn.h"
-
-#include "wx/msw/private.h"
-
 #include <wtypes.h>
 #include <unknwn.h>
 #include <ole2.h>
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 6b0dae49c8..d2a0214af7 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -949,6 +949,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         case EN_ERRSPACE:
         case EN_HSCROLL:
         case EN_VSCROLL:
+            return FALSE;
         default:
             return FALSE;
     }
diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index cb883092d6..c4f1543585 100644
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -1552,15 +1552,15 @@ void wxResourceManager::DistributePositions(int command)
         
         item->Move(controlX, controlY);
         
-        int resX = resource->GetWidth();
-        int resY = resource->GetHeight();
+        int resX = controlX;
+        int resY = controlY;
         
         // Also update the associated resource
         // We need to convert to dialog units if this is not a dialog or panel, but
         // the parent resource specifies dialog units.
         if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
         {
-            wxPoint convertedPos = item->GetParent()->ConvertPixelsToDialog(wxPoint(pos.x, pos.y));
+            wxPoint convertedPos = item->GetParent()->ConvertPixelsToDialog(wxPoint(resX, resY));
             resX = convertedPos.x;
             resY = convertedPos.y;
         }