Avoid core dumps when SetImageList is used.

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 6ad79060fc1bbd96b8d80f0d294db452fe2312e7..fd950861b2b688b9f950a00d9a38d6f6a7eb9cd4 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation
 #endif
 
     #pragma implementation
 #endif
 


@@ -51,15 +51,6 @@
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-// ----------------------------------------------------------------------------
-// function prototypes
-// ----------------------------------------------------------------------------
-
-// from src/msw/app.cpp
-extern void WXDLLEXPORT wxEntryCleanup();
-
-static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
-

 // ============================================================================
 // implementation: various entry points
 // ============================================================================
 // ============================================================================
 // implementation: various entry points
 // ============================================================================


@@ -70,16 +61,36 @@ static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 
 WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         HINSTANCE WXUNUSED(hPrevInstance),
 
 WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         HINSTANCE WXUNUSED(hPrevInstance),

-                        char *pCmdLine,
+                        char * WXUNUSED(pCmdLine),

                         int nCmdShow)
 {
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
     wxApp::m_nCmdShow = nCmdShow;
 
                         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);
+    // 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);
+    }
+
+    int argc = args.GetCount();
+
+    // +1 here for the terminating NULL
+    wxChar **argv = new wxChar *[argc + 1];
+    for ( int i = 0; i < argc; i++ )
+    {
+        argv[i] = wxStrdup(args[i]);
+    }
+
+    // argv[] must be NULL-terminated
+    argv[argc] = NULL;

 
     return wxEntry(argc, argv);
 }
 
     return wxEntry(argc, argv);
 }


@@ -98,17 +109,7 @@ extern "C"
 // Note that WinMain is also defined in dummy.obj, which is linked to
 // an application that is using the DLL version of wxWindows.
 
 // 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)
-
-int PASCAL WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
-{
-    return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
-}
-
-#else // _WINDLL
+#if defined(_WINDLL)

 
 // DLL entry point
 
 
 // DLL entry point
 


@@ -137,46 +138,12 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif // _WINDLL/!_WINDLL
+#endif // _WINDLL

 
 } // extern "C"
 
 #endif // !NOMAIN
 
 
 } // extern "C"
 
 #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];
-
-    argv[0] = new wxChar[MAX_PATH];
-    ::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
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------