X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bce6687f47dfa5fb8d4bab92702a5b5b1eb3485..d66dcb6022662c03aa32f1c7ad306552f1edfdc0:/src/msw/main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 6803110d50..9c99ed611c 100644
--- 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,15 +72,11 @@ HINSTANCE wxhInstance = 0;
 
 #if !defined(_WINDLL)
 
-#if defined(__WXWINE__)
-    #define HINSTANCE HINSTANCE__*
-
-    extern "C"
-#elif defined(__TWIN32__) || defined(__WXMICROWIN__)
+#if defined(__TWIN32__) || defined(__WXMICROWIN__)
     #define HINSTANCE HANDLE
 
     extern "C"
-#endif // WINE
+#endif
 
 int PASCAL WinMain(HINSTANCE hInstance,
                    HINSTANCE hPrevInstance,