Commit FM's GTK+ native assert dialog code.

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index c86c0909eb4faffce814882a47d9e5b69faa4cf7..00728f40fdf22709d86da3649301c515f73effc9 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:
 // Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:


@@ -24,8 +24,11 @@
     #pragma hdrstop
 #endif
 
     #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"
 
 #include "wx/cmdline.h"
 #include "wx/scopeguard.h"
 


@@ -244,10 +247,10 @@ static bool wxIsUnicodeAvailable()
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 
 {
     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
     {
         // 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
         // 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
 }
 
 #endif // wxUSE_BASE

-