diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm
index 69ab062525..cdea35dd73 100644
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -186,6 +186,24 @@ has been built into wxString.<P>
 There is nothing to stop an application using templates or the string class for its own
 purposes.<P>
 
+<H3>Is there a rich edit/markup widget for wxWindows 2?</H3>
+
+These are the possibilities so far:<P>
+
+<ul>
+<li>The richedit sample has a text editor that does markup.
+<li>See <a href="http://www.scintilla.org" target=_top>www.scintilla.org</a> for
+a very nice syntax-highlighting editor widget. Robin Dunn is writing a wxWindows wrapper
+for this widget.
+<li>If you only need to display marked-up information, rather than edit it,
+then wxHTML will suit your needs. wxHTML is built into wxWindows - please see the reference
+manual for details, and samples/html.
+<li>There are rich edit widgets in both WIN32 and GTK+, but there is currently
+no wxWindows wrapper for these.
+</ul>
+
+<P>
+
 <H3>How is wxWindows 2 being developed?</H3>
 
 We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWindows. This allows
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 3a5e7d719a..0687233f09 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -232,6 +232,10 @@ either install odbc32.lib from the BC++ CD-ROM into your BC++ lib
 directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and
 recompile wxWindows. The same applies if compiling using the IDE.
 
+Note (5): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder;
+you will therefore need to set wxUSE_LIBJPEG to 0 in setup.h and remove
+the jpeg target from src\msw\makefile.b32.
+
 Compiling using the IDE files:
 
 1. Load src\bc32.ide (Release settings)
diff --git a/include/wx/app.h b/include/wx/app.h
index 79d794857b..4b682d6aa8 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -377,7 +377,7 @@ public:
 #elif defined(__WXMSW__) && defined(WXUSINGDLL)
     // NT defines APIENTRY, 3.x not
     #if !defined(WXAPIENTRY)
-        #define WXAPIENTRY FAR wxSTDCALL
+        #define WXAPIENTRY WXFAR wxSTDCALL
     #endif
 
     #define IMPLEMENT_WXWIN_MAIN \
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 40fc6e054f..0b6b3cb00d 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1817,17 +1817,16 @@ typedef WXHWND WXWidget;
 #endif
 
 // the keywords needed for WinMain() declaration
+
 #ifdef __WIN16__
-    #ifndef FAR
         #ifdef __VISUALC__
-            #define FAR __far
+            #define WXFAR __far
         #else // !VC++
-            #define FAR _far
+            #define WXFAR _far
         #endif
-    #endif // no FAR
 #else // Win32
-    #ifndef FAR
-        #define FAR
+    #ifndef WXFAR
+        #define WXFAR
     #endif
 #endif // Win16/32
 
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 6ac8609207..a26d420e68 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -258,7 +258,9 @@ wxLongLong wxGetLocalTimeMillis()
         return (val + tp.millitm);
     }
 #else
+#ifndef __BORLANDC__
     #warning "wxStopWatch will be up to second resolution!"
+#endif
 #endif
 
     return val;
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 41b3053e08..e856345409 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -710,7 +710,7 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
     //
     // m_owner->PrepareDC( dc );
 
-    wxCoord x, y;
+    int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
     dc.SetDeviceOrigin( 0, -y );
 
@@ -763,7 +763,7 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
     //
     // m_owner->PrepareDC( dc );
 
-    wxCoord x, y;
+    int x, y;
     m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
     dc.SetDeviceOrigin( -x, 0 );
 
diff --git a/src/jpeg/jdmerge.c b/src/jpeg/jdmerge.c
index 37444468c2..2d29195505 100644
--- a/src/jpeg/jdmerge.c
+++ b/src/jpeg/jdmerge.c
@@ -279,7 +279,6 @@ h2v1_merged_upsample (j_decompress_ptr cinfo,
   }
 }
 
-
 /*
  * Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
  */
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 71572064ba..da186dcf9c 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -462,7 +462,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                     case CF_OEMTEXT:
                         size = strlen((const char *)pBuf);
                         break;
-#ifndef __WATCOMC__
+#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                     case CF_UNICODETEXT:
                         size = wcslen((const wchar_t *)pBuf);
                         break;
diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 3cb1a61dbb..500e98fda8 100644
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -157,7 +157,7 @@ void wxStatusBar95::CopyFieldsWidth(const int widths[])
   }
 }
 
-void wxStatusBar95::SetFieldsCount(int nFields, const int widths[])
+void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
 {
   // this is Windows limitation
   wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );