xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 20a274a5dc2f72d9dc60563f86d8f18f19e8b212..9f96ac237c957a9a42556a1a038404f1ed8a2c77 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
 


@@ -55,9 +55,6 @@
 // function prototypes
 // ----------------------------------------------------------------------------
 
 // function prototypes
 // ----------------------------------------------------------------------------
 

-// from src/msw/app.cpp
-extern void WXDLLEXPORT wxEntryCleanup();
-

 static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 
 // ============================================================================
 static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 
 // ============================================================================


@@ -68,13 +65,13 @@ static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 // Windows-specific wxEntry
 // ----------------------------------------------------------------------------
 
 // Windows-specific wxEntry
 // ----------------------------------------------------------------------------
 

-int wxEntry(WXHINSTANCE hInstance,
-            WXHINSTANCE WXUNUSED(hPrevInstance),
-            char *pCmdLine,
-            int nCmdShow)
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        char *pCmdLine,
+                        int nCmdShow)

 {
     // remember the parameters Windows gave us
 {
     // remember the parameters Windows gave us

-    wxSetInstance((HINSTANCE)hInstance);
+    wxSetInstance(hInstance);

     wxApp::m_nCmdShow = nCmdShow;
 
     // parse the command line
     wxApp::m_nCmdShow = nCmdShow;
 
     // parse the command line


@@ -98,20 +95,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((WXHINSTANCE) hInstance,
-                   (WXHINSTANCE) hPrevInstance,
-                   lpCmdLine,
-                   nCmdShow);
-}
-
-#else // _WINDLL
+#if defined(_WINDLL)

 
 // DLL entry point
 
 
 // DLL entry point
 


@@ -126,7 +110,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:

-            return wxEntry((WXHINSTANCE) hModule);
+            return wxEntry(hModule);

 
         case DLL_PROCESS_DETACH:
             wxEntryCleanup();
 
         case DLL_PROCESS_DETACH:
             wxEntryCleanup();


@@ -140,7 +124,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 
 } // extern "C"
 
 
 } // extern "C"
 


@@ -165,7 +149,9 @@ wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc)
     // and +1 here for the terminating NULL
     wxChar **argv = new wxChar *[argc + 1];
 
     // and +1 here for the terminating NULL
     wxChar **argv = new wxChar *[argc + 1];
 

-    argv[0] = new wxChar[MAX_PATH];
+    // 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[]
     ::GetModuleFileName(wxhInstance, argv[0], MAX_PATH);
 
     // copy all the other arguments to wxApp::argv[]