fixed GetWeekOfYear() for first/last week in some cases (patch 908793)

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index a9ba8c408131f718b38c757c4e4b33c8af3fa9d3..12feee5bdfa443b7e5d52abe9fb1e1dbe7ac2a12 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -34,11 +34,6 @@
 
 #include "wx/msw/private.h"
 
-// Don't implement WinMain if we're building an MFC/wxWidgets hybrid app.
-#if wxUSE_MFC && !defined(NOMAIN)
-    #define NOMAIN 1
-#endif
-
 #ifdef __BORLANDC__
     // BC++ has to be special: its run-time expects the DLL entry point to be
     // named DllEntryPoint instead of the (more) standard DllMain
@@ -131,8 +126,8 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
             break;
     }
 #else
-       (void)hModule;
-       (void)fdwReason;
+    (void)hModule;
+    (void)fdwReason;
 #endif // !WXMAKINGDLL
 
     return TRUE;