From 858f7d664166563a7725f3487249eed7f30e2f31 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 3 Feb 1999 22:50:06 +0000
Subject: [PATCH] _MSC_VER change fixes - now compiles again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/defs.h   | 2 +-
 include/wx/object.h | 1 +
 include/wx/wxprec.h | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index fd5cd7c644..48507c825a 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -57,7 +57,7 @@
     // define another standard symbol for Microsoft Visual C++: the standard one
     // (_MSC_VER) is also defined by Metrowerks compiler
     #if defined(_MSC_VER) && !defined(__MWERKS__)
-        #define __VISUALC__
+        #define __VISUALC__ _MSC_VER
     #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
         #define __BORLANDC__
       #elif defined(__WATCOMC__)
diff --git a/include/wx/object.h b/include/wx/object.h
index abd725a3f2..016bdc6311 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -34,6 +34,7 @@ class WXDLLEXPORT wxObject;
 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;
+class WXDLLEXPORT wxOutputStream;
 class WXDLLEXPORT wxObjectInputStream;
 class WXDLLEXPORT wxObjectOutputStream;
 class WXDLLEXPORT wxHashTable;
diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index eff6f75395..6f542b6a45 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/setup.h"   // always include this file (under Unix it's generated by configure)
+#include "wx/defs.h"    // compiler definitions
+
 // check if to use precompiled headers
 #if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
     #if !NOPCH
@@ -63,8 +66,5 @@
 #undef LoadAccelerators
 #endif
 
-#else
-  // always include this file (under Unix it's generated by configure)
-  #include "wx/setup.h"
-#endif
+#endif // WX_PRECOMP
 
-- 
2.45.2