fixed linker errors

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 1ee977b1048181b2503482b56f6ba3a11b7c6a6d..94299293e178c600ebf6bbb223328d29f38a8fba 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msw/main.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msw/main.cpp

-// Purpose:     Main/DllMain
+// Purpose:     WinMain/DllMain

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -33,79 +33,74 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-// from src/msw/app.cpp
-extern void WXDLLEXPORT wxEntryCleanup();
+// Don't implement WinMain if we're building an MFC/wxWindows hybrid app.
+#if wxUSE_MFC && !defined(NOMAIN)
+    #define NOMAIN 1
+#endif
+
+#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(__WXMICROWIN__)
+    #define HINSTANCE HANDLE
+#endif

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// globals
+// function prototypes

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-HINSTANCE wxhInstance = 0;
+// from src/msw/app.cpp
+extern void WXDLLEXPORT wxEntryCleanup();

 
 // ============================================================================
 
 // ============================================================================

-// implementation
+// implementation: various entry points

 // ============================================================================
 
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// 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)
 
 // 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)
 

-// NT defines APIENTRY, 3.x not
-#if !defined(APIENTRY)
-    #define APIENTRY FAR PASCAL
-#endif
+extern "C"
+{

 
 

-/////////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------

 // WinMain
 // WinMain

+// ----------------------------------------------------------------------------
+

 // 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)
 
 // 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)
 

-#if defined(__TWIN32__) || defined(__WXWINE__)
-    #define HINSTANCE HANDLE
-
-    extern "C"
-#endif // WINE
-

 int PASCAL WinMain(HINSTANCE hInstance,
                    HINSTANCE hPrevInstance,
                    LPSTR lpCmdLine,
                    int nCmdShow)
 {
 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 // !defined(_WINDLL)
-
-/////////////////////////////////////////////////////////////////////////////////
-// DllMain
-
-#if defined(_WINDLL)
+#else // _WINDLL

 
 // DLL entry point
 
 
 // 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:
 #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.

             return wxEntry((WXHINSTANCE) hModule);
 
         case DLL_PROCESS_DETACH:
             return wxEntry((WXHINSTANCE) hModule);
 
         case DLL_PROCESS_DETACH:


@@ -118,18 +113,24 @@ BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
        (void)hModule;
        (void)fdwReason;
 #endif // !WXMAKINGDLL
        (void)hModule;
        (void)fdwReason;
 #endif // !WXMAKINGDLL

-       (void)lpReserved;
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif // _WINDLL
+#endif // _WINDLL/!_WINDLL
+
+} // extern "C"

 
 #endif // !NOMAIN
 
 // ----------------------------------------------------------------------------
 
 #endif // !NOMAIN
 
 // ----------------------------------------------------------------------------

-// global functions
+// global HINSTANCE

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+#if wxUSE_BASE
+
+HINSTANCE wxhInstance = 0;
+

 HINSTANCE wxGetInstance()
 {
     return wxhInstance;
 HINSTANCE wxGetInstance()
 {
     return wxhInstance;


@@ -140,3 +141,5 @@ void wxSetInstance(HINSTANCE hInst)
     wxhInstance = hInst;
 }
 
     wxhInstance = hInst;
 }
 

+#endif // wxUSE_BASE
+