fixed LastRead() after Read(wxOutputStream&) (patch 1658301)

[wxWidgets.git] / src / msw / main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index c86c0909eb4faffce814882a47d9e5b69faa4cf7..4676a2d24159d43ff72dd4c35fcfd97c23477182 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/main.cpp
+// Name:        src/msw/main.cpp
 // Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:
@@ -24,8 +24,11 @@
     #pragma hdrstop
 #endif
 
-#include "wx/event.h"
-#include "wx/app.h"
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+    #include "wx/app.h"
+#endif //WX_PRECOMP
+
 #include "wx/cmdline.h"
 #include "wx/scopeguard.h"
 
@@ -75,8 +78,8 @@ extern int wxEntryReal(int& argc, wxChar **argv);
 
     // this warns that /EHa (async exceptions) should be used when using
     // _set_se_translator but, in fact, this doesn't seem to change anything
-    // with VC++ up to 7.1 -- to be confirmed with VC++ 8
-    #if _MSC_VER <= 1310
+    // with VC++ up to 8.0
+    #if _MSC_VER <= 1400
         #pragma warning(disable:4535)
     #endif
 
@@ -244,10 +247,10 @@ static bool wxIsUnicodeAvailable()
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 
-    if ( wxGetOsVersion() != wxWINDOWS_NT )
+    if ( wxGetOsVersion() != wxOS_WINDOWS_NT )
     {
         // we need to be built with MSLU support
-#if !wxUSE_UNICODE_MSLU 
+#if !wxUSE_UNICODE_MSLU
         // note that we can use MessageBoxW() as it's implemented even under
         // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs
         // used by wxLocale are not
@@ -403,4 +406,3 @@ void wxSetInstance(HINSTANCE hInst)
 }
 
 #endif // wxUSE_BASE
-