compilation fix for wxUSE_VALIDATORS==0

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 6803110d507b83db10d280311bbdacaef097275b..1a136df962d2941e5ac87fd64ac67f6b1757fed3 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

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation
 #endif
 
     #pragma implementation
 #endif
 


@@ -30,110 +30,130 @@
 
 #include "wx/event.h"
 #include "wx/app.h"
 
 #include "wx/event.h"
 #include "wx/app.h"

+#include "wx/cmdline.h"

 
 #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

 
 

-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
+#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

 
 

-HINSTANCE wxhInstance = 0;
+#if defined(__WXMICROWIN__)
+    #define HINSTANCE HANDLE
+#endif
+
+#if wxUSE_GUI

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

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

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// various entry points
+// Windows-specific wxEntry

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

-// 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
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        wxCmdLineArgType WXUNUSED(pCmdLine),
+                        int nCmdShow)
+{
+    // remember the parameters Windows gave us
+    wxSetInstance(hInstance);
+    wxApp::m_nCmdShow = nCmdShow;
+
+    // parse the command line: we can't use pCmdLine in Unicode build so it is
+    // simpler to never use it at all (this also results in a more correct
+    // argv[0])
+
+    // break the command line in words
+    wxArrayString args;
+    const wxChar *cmdLine = ::GetCommandLine();
+    if ( cmdLine )
+    {
+        args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
+    }

 
 

-/////////////////////////////////////////////////////////////////////////////////
-// WinMain
-// Note that WinMain is also defined in dummy.obj, which is linked to
-// an application that is using the DLL version of wxWindows.
+    int argc = args.GetCount();

 
 

-#if !defined(_WINDLL)
+    // +1 here for the terminating NULL
+    wxChar **argv = new wxChar *[argc + 1];
+    for ( int i = 0; i < argc; i++ )
+    {
+        argv[i] = wxStrdup(args[i]);
+    }

 
 

-#if defined(__WXWINE__)
-    #define HINSTANCE HINSTANCE__*
+    // argv[] must be NULL-terminated
+    argv[argc] = NULL;

 
 

-    extern "C"
-#elif defined(__TWIN32__) || defined(__WXMICROWIN__)
-    #define HINSTANCE HANDLE
+    return wxEntry(argc, argv);
+}

 
 

-    extern "C"
-#endif // WINE
+// 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)

 
 

-int PASCAL WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
+extern "C"

 {
 {

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

 
 

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

 
 

-/////////////////////////////////////////////////////////////////////////////////
-// DllMain
+// 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)
 
 // DLL entry point
 
 
 #if defined(_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:
 #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);
+            return wxEntry(hModule);

 
         case DLL_PROCESS_DETACH:
 
         case DLL_PROCESS_DETACH:

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

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

-       (void)lpReserved;
+

     return TRUE;
 }
 
 #endif // _WINDLL
 
     return TRUE;
 }
 
 #endif // _WINDLL
 

+} // extern "C"
+

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

+#endif // wxUSE_GUI
+

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

-// global functions
+// global HINSTANCE

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

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

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


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

+#endif // wxUSE_BASE
+