SourceForge patch #654210 to fix naming/numbering shared libs under OS X

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index f9a4ae5e657d41f7098004aef612d4f44b757485..00736a1394dce0105eaadb95984c6e55762313c7 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,7 +72,11 @@ HINSTANCE wxhInstance = 0;
 
 #if !defined(_WINDLL)
 
-#if defined(__TWIN32__) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+#if defined(__WXWINE__)
+    #define HINSTANCE HINSTANCE__*
+
+    extern "C"
+#elif defined(__TWIN32__) || defined(__WXMICROWIN__)
     #define HINSTANCE HANDLE
 
     extern "C"