]> git.saurik.com Git - wxWidgets.git/commitdiff
removed DllMain(): we don't even compile it with any compiler but VC8 and with VC8...
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 19 Dec 2005 14:34:12 +0000 (14:34 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 19 Dec 2005 14:34:12 +0000 (14:34 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/main.cpp

index 1967e0cff282a56ad1cfd6cf07a37b7e91c407f1..35f1ada5fc6a9def1a20378859348cc22f9a8942 100644 (file)
@@ -382,55 +382,6 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     return wxEntry(argc, argv);
 }
 
-// May wish not to have a DllMain or WinMain, e.g. if we're programming
-// a Netscape plugin or if we're writing a console application
-#if !defined(NOMAIN)
-
-extern "C"
-{
-
-// ----------------------------------------------------------------------------
-// WinMain
-// ----------------------------------------------------------------------------
-
-// Note that WinMain is also defined in dummy.obj, which is linked to
-// an application that is using the DLL version of wxWidgets.
-
-#if defined(_WINDLL)
-
-// DLL entry point
-
-BOOL WINAPI
-DllMain(HINSTANCE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
-{
-    // Only call wxEntry if the application itself is part of the DLL.
-    // If only the wxWidgets library is in the DLL, then the
-    // initialisation will be called when the application implicitly
-    // calls WinMain.
-#ifndef WXMAKINGDLL
-    switch (fdwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            return wxEntry(hModule);
-
-        case DLL_PROCESS_DETACH:
-            wxEntryCleanup();
-            break;
-    }
-#else
-    (void)hModule;
-    (void)fdwReason;
-#endif // !WXMAKINGDLL
-
-    return TRUE;
-}
-
-#endif // _WINDLL
-
-} // extern "C"
-
-#endif // !NOMAIN
-
 #endif // wxUSE_GUI && __WXMSW__
 
 // ----------------------------------------------------------------------------