Committing in .

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index cfa9a598c97e602a55a5864e8999ade95e54fbec..f9a4ae5e657d41f7098004aef612d4f44b757485 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -33,6 +33,9 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+// from src/msw/app.cpp
+extern void WXDLLEXPORT wxEntryCleanup();
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -63,27 +66,22 @@ HINSTANCE wxhInstance = 0;
 
 #if !defined(_WINDLL)
 
 
 #if !defined(_WINDLL)
 

-#if defined(__TWIN32__) || defined(__WXWINE__)
-
-extern "C"
-BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-
-#else
-
-#ifdef __WATCOMC__
-int PASCAL
-#else
-int APIENTRY
-#endif
+#if defined(__TWIN32__) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+    #define HINSTANCE HANDLE

 
 

- WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
-#endif
-// __TWIN32__
+    extern "C"
+#endif // WINE

 
 

+int PASCAL WinMain(HINSTANCE hInstance,
+                   HINSTANCE hPrevInstance,
+                   LPSTR lpCmdLine,
+                   int nCmdShow)

 {
 {

-  return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, lpCmdLine, nCmdShow);
+    return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance,
+                   lpCmdLine, nCmdShow);

 }
 }

-#endif
+
+#endif // !defined(_WINDLL)

 
 /////////////////////////////////////////////////////////////////////////////////
 // DllMain
 
 /////////////////////////////////////////////////////////////////////////////////
 // DllMain


@@ -100,22 +98,27 @@ BOOL WINAPI DllEntryPoint (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
 BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
 #endif
 {
 BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
 #endif
 {

+#ifndef WXMAKINGDLL

     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
             // Only call wxEntry if the application itself is part of the DLL.
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
             // Only call wxEntry if the application itself is part of the DLL.

-            // If only the wxWindows library is in the DLL, then the initialisation
-            // will be called when the application implicitly calls WinMain.
-
-#if !defined(WXMAKINGDLL)
+            // If only the wxWindows library is in the DLL, then the
+            // initialisation will be called when the application implicitly
+            // calls WinMain.

             return wxEntry((WXHINSTANCE) hModule);
             return wxEntry((WXHINSTANCE) hModule);

-#endif
-            break;

 
         case DLL_PROCESS_DETACH:
 
         case DLL_PROCESS_DETACH:

-        default:
-            break;
+           if ( wxTheApp )
+              wxTheApp->OnExit();
+           wxEntryCleanup();
+           break;

     }
     }

+#else
+       (void)hModule;
+       (void)fdwReason;
+#endif // !WXMAKINGDLL
+       (void)lpReserved;

     return TRUE;
 }
 
     return TRUE;
 }