moved assert for parent window not being a static box to common code where it should...

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 237eb9eee3d0857f92f5fe497aa37ca484482a1d..9c99ed611c3fab14d38f113b503b84c0c0dcc14c 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -33,6 +33,12 @@
 
 #include "wx/msw/private.h"
 
+// Don't implement WinMain if we're building an MFC/wxWindows
+// hybrid app.
+#if wxUSE_MFC && !defined(NOMAIN)
+#define NOMAIN 1
+#endif
+
 // from src/msw/app.cpp
 extern void WXDLLEXPORT wxEntryCleanup();
 
@@ -66,11 +72,11 @@ HINSTANCE wxhInstance = 0;
 
 #if !defined(_WINDLL)
 
-#if defined(__TWIN32__) || defined(__WXWINE__)
+#if defined(__TWIN32__) || defined(__WXMICROWIN__)
     #define HINSTANCE HANDLE
 
     extern "C"
-#endif // WINE
+#endif
 
 int PASCAL WinMain(HINSTANCE hInstance,
                    HINSTANCE hPrevInstance,
@@ -114,8 +120,11 @@ BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
            wxEntryCleanup();
            break;
     }
+#else
+       (void)hModule;
+       (void)fdwReason;
 #endif // !WXMAKINGDLL
-
+       (void)lpReserved;
     return TRUE;
 }