diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 7feb4dd96e..744052639d 100644
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -409,7 +409,7 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-cleanall: clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
+cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
diff --git a/docs/latex/wx/bbutton.tex b/docs/latex/wx/bbutton.tex
index b8ab20fd13..0ae2fb824b 100644
--- a/docs/latex/wx/bbutton.tex
+++ b/docs/latex/wx/bbutton.tex
@@ -29,7 +29,11 @@ the selected state, unpressed focused state, and greyed-out state may be supplie
 \twocolitem{\windowstyle{wxBU\_AUTODRAW}}{If
 this is specified, the button will be drawn automatically using the label bitmap only, providing
 a 3D-look border. If this style is not specified, the button will be drawn without borders and using all
-provided bitmaps.}
+provided bitmaps. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_LEFT}}{Left-justifies the bitmap label. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_TOP}}{Aligns the bitmap label to the top of the button. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_RIGHT}}{Right-justifies the bitmap label. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_BOTTOM}}{Aligns the bitmap label to the bottom of the button. WIN32 only.}
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.
diff --git a/docs/latex/wx/button.tex b/docs/latex/wx/button.tex
index d4b848e12f..966fa06461 100644
--- a/docs/latex/wx/button.tex
+++ b/docs/latex/wx/button.tex
@@ -18,7 +18,13 @@ almost any other window.
 
 \wxheading{Window styles}
 
-There are no special styles for wxButton.
+\twocolwidtha{5cm}%
+\begin{twocollist}\itemsep=0pt
+\twocolitem{\windowstyle{wxBU\_LEFT}}{Left-justifies the label. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_TOP}}{Aligns the label to the top of the button. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_RIGHT}}{Right-justifies the bitmap label. WIN32 only.}
+\twocolitem{\windowstyle{wxBU\_BOTTOM}}{Aligns the label to the bottom of the button. WIN32 only.}
+\end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.
 
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index a4f679ea29..21e36b2f9b 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -160,6 +160,9 @@
 // non GUI features selection
 // ----------------------------------------------------------------------------
 
+// Set to 1 to build in Unicode mode (wxchar.h will define _UNICODE and UNICODE)
+#define wxUSE_UNICODE       1
+
 // Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
 // integer which is implemented in terms of native 64 bit integers if any or
 // uses emulation otherwise.
@@ -630,6 +633,12 @@
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif // wxUSE_MFC
 
+// ODBC classes aren't Unicode-compatible yet
+#if wxUSE_UNICODE
+#undef wxUSE_ODBC
+#define wxUSE_ODBC 0
+#endif
+
 #if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 92d5729370..cf508681b7 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -146,7 +146,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 // ----------------------------------------------------------------------------
 
 // filenames are multibyte on Unix and probably widechar on Windows?
-#if defined(__UNIX__) || defined(__BORLANDC__)
+#if defined(__UNIX__) || defined(__WIN32__)
     #define wxMBFILES 1
 #else
     #define wxMBFILES 0
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9e120a89eb..a9a8c05620 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -157,7 +157,9 @@ LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 // FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
 //       needs compiler support for Win32 SEH. Others (especially Borland)
 //       probably have it too, but I'm not sure about how it works
-#if !defined(__VISUALC__) || defined(__WIN16__)
+// JACS: get 'Cannot use __try in functions that require unwinding
+// in Unicode mode, so disabling.
+#if !defined(__VISUALC__) || defined(__WIN16__) || defined(UNICODE)
     #undef wxUSE_ON_FATAL_EXCEPTION
     #define wxUSE_ON_FATAL_EXCEPTION 0
 #endif // VC++
diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 389de208ac..eca894e0db 100644
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -28,7 +28,9 @@
   #include  "wx/utils.h"
 #endif  //WX_PRECOMP
 
-#if wxUSE_CONFIG
+// Doesn't yet compile in Unicode mode
+
+#if wxUSE_CONFIG && !wxUSE_UNICODE
 
 #include  "wx/dynarray.h"
 #include  "wx/log.h"
@@ -81,19 +83,19 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
     m_strLocalFilename = localFilename;
     if (m_strLocalFilename.IsEmpty())
     {
-        m_strLocalFilename = GetAppName() + ".ini";
+        m_strLocalFilename = GetAppName() + wxT(".ini");
     }
 
     // append the extension if none given and it's not an absolute file name
     // (otherwise we assume that they know what they're doing)
     if ( !wxIsPathSeparator(m_strLocalFilename[0u]) &&
-        m_strLocalFilename.Find('.') == wxNOT_FOUND )
+        m_strLocalFilename.Find(wxT('.')) == wxNOT_FOUND )
     {
-        m_strLocalFilename << ".ini";
+        m_strLocalFilename << wxT(".ini");
     }
 
     // set root path
-    SetPath("");
+    SetPath(wxT(""));
 }
 
 wxIniConfig::~wxIniConfig()
@@ -491,4 +493,4 @@ bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
 }
 
 #endif
-    // wxUSE_CONFIG
+    // wxUSE_CONFIG && wxUSE_UNICODE
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 1fac1dc462..14346f1413 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -127,7 +127,7 @@ extern "C" {
 #endif
 
 #  if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
-#  define new new(__FILE__,__LINE__)
+#  define new new(__TFILE__,__LINE__)
 #  endif
 
 #endif