Index: boost/boost/format/format_class.hpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/boost/format/format_class.hpp,v
retrieving revision 1.1
diff -u -r1.1 format_class.hpp
--- boost/boost/format/format_class.hpp	2002/11/20 17:20:54	1.1
+++ boost/boost/format/format_class.hpp	2003/05/18 20:42:20
@@ -20,6 +20,8 @@
 #ifndef BOOST_FORMAT_CLASS_HPP
 #define BOOST_FORMAT_CLASS_HPP
 
+#  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+
 #include <vector>
 #include <sstream>
 #include <string>
Index: boost/boost/regex/config.hpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/boost/regex/config.hpp,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 config.hpp
--- boost/boost/regex/config.hpp	2003/02/20 16:08:40	1.3.2.3
+++ boost/boost/regex/config.hpp	2003/05/18 20:42:26
@@ -247,10 +247,10 @@
 
 #if defined(BOOST_REGEX_HAS_DLL_RUNTIME) && !defined(BOOST_REGEX_STATIC_LINK)
 #  if defined(BOOST_REGEX_SOURCE)
-#     define BOOST_REGEX_DECL __declspec(dllexport)
+//#     define BOOST_REGEX_DECL __declspec(dllexport)
 #     define BOOST_REGEX_BUILD_DLL
 #  else
-#     define BOOST_REGEX_DECL __declspec(dllimport)
+//#     define BOOST_REGEX_DECL __declspec(dllimport)
 #  endif
 #endif
 
Index: boost/libs/regex/src/cpp_regex_traits.cpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/libs/regex/src/cpp_regex_traits.cpp,v
retrieving revision 1.6
diff -u -r1.6 cpp_regex_traits.cpp
--- boost/libs/regex/src/cpp_regex_traits.cpp	2002/10/15 17:51:41	1.6
+++ boost/libs/regex/src/cpp_regex_traits.cpp	2003/05/18 20:42:32
@@ -31,6 +31,9 @@
 #  pragma warning(disable:4786 4702 4127 4244)
 #  endif
 
+#undef BOOST_USE_FACET
+#define BOOST_USE_FACET(Type, loc) std::_USE(loc, Type)
+
 #include <clocale>
 #include <locale>
 #include <cstdio>
Index: boost/libs/regex/src/w32_regex_traits.cpp
===================================================================
RCS file: /cvs/lyx/lyx-devel/boost/libs/regex/src/w32_regex_traits.cpp,v
retrieving revision 1.2
diff -u -r1.2 w32_regex_traits.cpp
--- boost/libs/regex/src/w32_regex_traits.cpp	2002/06/18 15:39:27	1.2
+++ boost/libs/regex/src/w32_regex_traits.cpp	2003/05/18 20:42:40
@@ -159,10 +159,6 @@
 
 std::list<syntax_map_t>* syntax;
 
-#endif
-
-std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, unsigned id);
-
 std::size_t BOOST_REGEX_CALL get_message(wchar_t* buf, std::size_t len, unsigned id)
 {
    std::size_t size = _re_get_message(static_cast<char*>(0), 0, id);
@@ -173,6 +169,10 @@
    size = boost::w32_regex_traits<wchar_t>::strwiden(buf, len, cb.get());
    return size;
 }
+
+#endif
+
+std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, unsigned id);
 
 inline std::size_t BOOST_REGEX_CALL get_message(char* buf, std::size_t len, unsigned id)
 {
Index: src/ispell.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/ispell.C,v
retrieving revision 1.5.2.2
diff -u -r1.5.2.2 ispell.C
--- src/ispell.C	2003/03/19 14:38:34	1.5.2.2
+++ src/ispell.C	2003/05/18 20:43:15
@@ -13,6 +13,7 @@
 #pragma implementation
 #endif
 
+#ifndef _WIN32
 #include "LString.h"
 #include "lyxrc.h"
 #include "language.h"
@@ -24,6 +25,7 @@
 
 #include "support/forkedcall.h"
 #include "support/lstrings.h"
+#include "support/os.h"
 
 #include <sys/select.h>
 #include <sys/time.h>
@@ -440,3 +442,32 @@
 {
 	return error_;
 }
+
+#else // _WIN32 dummy.
+
+#include "LString.h"
+
+class BufferParams;
+
+class ISpell {
+public:
+	ISpell(BufferParams const & params, string const & lang);
+
+	~ISpell();
+	
+private:
+	string error_;
+	
+};
+
+ISpell::ISpell(BufferParams const & params, string const & lang)	
+{
+	error_ = "ISpell not available on WIN32.";
+	return;
+}
+
+ISpell::~ISpell()
+{
+}
+
+#endif
\ No newline at end of file
Index: src/lyxrc.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyxrc.C,v
retrieving revision 1.139
diff -u -r1.139 lyxrc.C
--- src/lyxrc.C	2003/01/14 14:54:14	1.139
+++ src/lyxrc.C	2003/05/18 20:43:34
@@ -210,8 +210,8 @@
 	font_sizes[LyXFont::SIZE_HUGE] = 20.74;
 	font_sizes[LyXFont::SIZE_HUGER] = 24.88;
 	use_scalable_fonts = true;
-	roman_font_name = "times";
-	sans_font_name = "helvetica";
+	roman_font_name = "times new roman";
+	sans_font_name = "arial";
 	typewriter_font_name = "courier";
 	popup_bold_font = "-*-helvetica-bold-r";
 	popup_normal_font = "-*-helvetica-medium-r";