added Show/HideNativeCaret() (patch 759924)

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index cfa9a598c97e602a55a5864e8999ade95e54fbec..c293e7c5110f5b7082002c81b2e680197e4df3ad 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

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


@@ -30,103 +30,172 @@
 
 #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"
 

+// 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
+
+#if wxUSE_GUI
+

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

-// globals
+// function prototypes

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

-HINSTANCE wxhInstance = 0;
+static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);

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

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

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

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

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

+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        char *pCmdLine,
+                        int nCmdShow)
+{
+    // remember the parameters Windows gave us
+    wxSetInstance(hInstance);
+    wxApp::m_nCmdShow = nCmdShow;
+
+    // parse the command line
+    int argc;
+    wxChar **argv = ConvertToStandardCommandArgs(wxConvertMB2WX(pCmdLine), argc);
+
+    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
 // 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)
+#if !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__)
-
-extern "C"
-BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-
-#else
-
-#ifdef __WATCOMC__
-int PASCAL
+#ifdef __WXWINCE__
+int WINAPI WinMain(HINSTANCE hInstance,
+                   HINSTANCE hPrevInstance,
+                   LPWSTR lpCmdLine,
+                   int nCmdShow)
+{
+    return wxEntry(hInstance, hPrevInstance, (char*) lpCmdLine, nCmdShow);
+}

 #else
 #else

-int APIENTRY
-#endif
-
- WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
-#endif
-// __TWIN32__
-
+int PASCAL WinMain(HINSTANCE hInstance,
+                   HINSTANCE hPrevInstance,
+                   LPSTR lpCmdLine,
+                   int nCmdShow)

 {
 {

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

 }
 #endif
 
 }
 #endif
 

-/////////////////////////////////////////////////////////////////////////////////
-// 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:
     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;
+            return wxEntry(hModule);

 
         case DLL_PROCESS_DETACH:
 
         case DLL_PROCESS_DETACH:

-        default:
+            wxEntryCleanup();

             break;
     }
             break;
     }

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

     return TRUE;
 }
 
     return TRUE;
 }
 

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

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

+// ---------------------------------------------------------------------------
+// Convert Windows to argc, argv style
+// ---------------------------------------------------------------------------
+
+wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc)
+{
+    // break the command line in words
+    wxArrayString args;
+    if ( p )
+    {
+        args = wxCmdLineParser::ConvertStringToArgs(p);
+    }
+
+    // +1 here for the program name
+    argc = args.GetCount() + 1;
+
+    // and +1 here for the terminating NULL
+    wxChar **argv = new wxChar *[argc + 1];
+
+    // as we use wxStrdup below we must allocate the first argument using
+    // malloc(), not new[], as well
+    argv[0] = (wxChar *)malloc(MAX_PATH * sizeof(wxChar));
+    ::GetModuleFileName(wxhInstance, argv[0], MAX_PATH);
+
+    // copy all the other arguments to wxApp::argv[]
+    for ( int i = 1; i < argc; i++ )
+    {
+        argv[i] = wxStrdup(args[i - 1]);
+    }
+
+    // argv[] must be NULL-terminated
+    argv[argc] = NULL;
+
+    return argv;
+}
+
+#endif // wxUSE_GUI
+

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

-// global functions
+// global HINSTANCE

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

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

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


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

+#endif // wxUSE_BASE
+