From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 16 Aug 2003 15:30:25 +0000 (+0000)
Subject: moved WinMain into the application even for static build
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ac9a3c615a1d8eec589d2d0de7286f6d676f1693?ds=inline

moved WinMain into the application even for static build


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

diff --git a/include/wx/app.h b/include/wx/app.h
index 3698f65a09..a2e3d03c59 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -593,7 +593,7 @@ public:
 #if !wxUSE_GUI || !defined(__WXMSW__)
     #define IMPLEMENT_WXWIN_MAIN                                              \
         int main(int argc, char **argv) { return wxEntry(argc, argv); }
-#elif defined(__WXMSW__) && defined(WXUSINGDLL)
+#elif defined(__WXMSW__)
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 1fd175519f..9f96ac237c 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -95,27 +95,7 @@ extern "C"
 // Note that WinMain is also defined in dummy.obj, which is linked to
 // an application that is using the DLL version of wxWindows.
 
-#if !defined(_WINDLL)
-
-#ifdef __WXWINCE__
-int WINAPI WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPWSTR lpCmdLine,
-                   int nCmdShow)
-{
-    return wxEntry(hInstance, hPrevInstance, (char*) lpCmdLine, nCmdShow);
-}
-#else
-int PASCAL WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
-{
-    return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
-}
-#endif
-
-#else // _WINDLL
+#if defined(_WINDLL)
 
 // DLL entry point
 
@@ -144,7 +124,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     return TRUE;
 }
 
-#endif // _WINDLL/!_WINDLL
+#endif // _WINDLL
 
 } // extern "C"