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 3698f65a09e5219691a405ab488c27ef17a9deea..a2e3d03c5906bf7a4cb10c89a63f19bd5c96e320 100644 (file)
--- 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); }
 #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"
 
     // 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 1fd175519fe3a3882b5c236c4b5695d110af22b1..9f96ac237c957a9a42556a1a038404f1ed8a2c77 100644 (file)
--- 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.
 
 // 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
 
 
 // DLL entry point
 


@@ -144,7 +124,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif // _WINDLL/!_WINDLL
+#endif // _WINDLL

 
 } // extern "C"
 
 
 } // extern "C"