fixed linker errors

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 3565e7fa23885d4c1922c07c811c8695e2159ecc..94299293e178c600ebf6bbb223328d29f38a8fba 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -1,102 +1,145 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        main.cpp
-// Purpose:     Main/DllMain
+// Name:        msw/main.cpp
+// Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation
+    #pragma implementation
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/event.h"
 #include "wx/app.h"
-#include <windows.h>
 
-// May wish not to have a DllMain or WinMain, e.g. if we're programming
-// a Netscape plugin.
-#ifndef NOMAIN
+#include "wx/msw/private.h"
 
-// NT defines APIENTRY, 3.x not
-#if !defined(APIENTRY)
-#define APIENTRY FAR PASCAL
+// Don't implement WinMain if we're building an MFC/wxWindows hybrid app.
+#if wxUSE_MFC && !defined(NOMAIN)
+    #define NOMAIN 1
 #endif
 
-/////////////////////////////////////////////////////////////////////////////////
-// WinMain
-// Note that WinMain is also defined in dummy.obj, which is linked to
-// an application that is using the DLL version of wxWindows.
+#ifdef __BORLANDC__
+    // BC++ has to be special: its run-time expects the DLL entry point to be
+    // named DllEntryPoint instead of the (more) standard DllMain
+    #define DllMain DllEntryPoint
+#endif
 
-#if !defined(_WINDLL)
+#if defined(__WXMICROWIN__)
+    #define HINSTANCE HANDLE
+#endif
+
+// ----------------------------------------------------------------------------
+// function prototypes
+// ----------------------------------------------------------------------------
 
-#if defined(__TWIN32__) || defined(__WXWINE__)
+// from src/msw/app.cpp
+extern void WXDLLEXPORT wxEntryCleanup();
+
+// ============================================================================
+// implementation: various entry points
+// ============================================================================
+
+// 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 wxUSE_GUI && !defined(NOMAIN)
 
 extern "C"
-BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
 
-#else
+// ----------------------------------------------------------------------------
+// WinMain
+// ----------------------------------------------------------------------------
 
-#ifdef __WATCOMC__
-int PASCAL
-#else
-int APIENTRY
-#endif
+// Note that WinMain is also defined in dummy.obj, which is linked to
+// an application that is using the DLL version of wxWindows.
 
- WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
-#endif
-// __TWIN32__
+#if !defined(_WINDLL)
 
+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
-
-/////////////////////////////////////////////////////////////////////////////////
-// DllMain
 
-#if defined(_WINDLL)
+#else // _WINDLL
 
 // DLL entry point
 
-extern "C"
-#ifdef __BORLANDC__
-// SCD: I don't know why, but also OWL uses this function
-BOOL WINAPI DllEntryPoint (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-#else
-BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-#endif
+BOOL WINAPI
+DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 {
+    // 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.
+#ifndef WXMAKINGDLL
     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)
-        return wxEntry((WXHINSTANCE) hModule);
-#endif
-           break;
+    {
+        case DLL_PROCESS_ATTACH:
+            return wxEntry((WXHINSTANCE) hModule);
+
+        case DLL_PROCESS_DETACH:
+           if ( wxTheApp )
+              wxTheApp->OnExit();
+           wxEntryCleanup();
+           break;
+    }
+#else
+       (void)hModule;
+       (void)fdwReason;
+#endif // !WXMAKINGDLL
 
-       case DLL_PROCESS_DETACH:
-       default:
-           break;
-       }
-  return TRUE;
+    return TRUE;
 }
 
-#endif
+#endif // _WINDLL/!_WINDLL
 
-#endif
+} // extern "C"
+
+#endif // !NOMAIN
+
+// ----------------------------------------------------------------------------
+// global HINSTANCE
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BASE
+
+HINSTANCE wxhInstance = 0;
+
+HINSTANCE wxGetInstance()
+{
+    return wxhInstance;
+}
+
+void wxSetInstance(HINSTANCE hInst)
+{
+    wxhInstance = hInst;
+}
+
+#endif // wxUSE_BASE