Fix from Mumit Khan to allow mingw DLL compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/app.h b/include/wx/app.h
index 68749834a05e1651279723e83e3699c643e5d2bb..cb327df858f62151cb28d2c11b1b3bdad462692e 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -380,15 +380,35 @@ public:
         #define WXAPIENTRY WXFAR wxSTDCALL
     #endif
 
         #define WXAPIENTRY WXFAR wxSTDCALL
     #endif
 

-    #define IMPLEMENT_WXWIN_MAIN \
-        int WXAPIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,\
+    // Patch from Mumit Khan to allow DLL compilation under mingw. Note that
+    // this includes <windows.h> which is a bad thing because it prevents
+    // wxWindows to work with MFC, so for now I'm making this change for
+    // mingw/cygwin only (these don't work with MFC yet). GRG Mar/2000
+    #ifdef(__GNUWIN32__)
+        #include <windows.h>
+        #include "wx/msw/winundef.h"
+
+        #define IMPLEMENT_WXWIN_MAIN \
+            extern "C" int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int);\
+            int WINAPI WinMain(HINSTANCE hInstance, \
+                               HINSTANCE hPrevInstance,\

                                LPSTR m_lpCmdLine, int nCmdShow )\
                                LPSTR m_lpCmdLine, int nCmdShow )\

-        {\
-            return wxEntry((WXHINSTANCE) hInstance, \
-                           (WXHINSTANCE) hPrevInstance,\
-                           m_lpCmdLine, nCmdShow);\
-        }
-
+            {\
+                return wxEntry((WXHINSTANCE) hInstance, \
+                               (WXHINSTANCE) hPrevInstance,\
+                               m_lpCmdLine, nCmdShow);\
+            }
+    #else
+        #define IMPLEMENT_WXWIN_MAIN \
+            int WXAPIENTRY WinMain(HINSTANCE hInstance, \
+                                   HINSTANCE hPrevInstance,\
+                                   LPSTR m_lpCmdLine, int nCmdShow )\
+            {\
+                return wxEntry((WXHINSTANCE) hInstance, \
+                               (WXHINSTANCE) hPrevInstance,\
+                               m_lpCmdLine, nCmdShow);\
+            }
+    #endif

 #else
     #define IMPLEMENT_WXWIN_MAIN
 #endif
 #else
     #define IMPLEMENT_WXWIN_MAIN
 #endif