wxProcess-related code now works

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index ac63e42c763c0f8947cb75d6de0bc9f22a0c6831..cbf871abdea2d4b3cc73d757ef4750e6d0802ece 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -227,7 +227,7 @@ bool wxApp::Initialize()
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.

-#if defined(_MSC_VER) && !defined(WXMAKINGDLL)
+#if defined(__VISUALC__) && !defined(WXMAKINGDLL)

     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif


@@ -445,6 +445,15 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 void wxApp::CleanUp()
 {
   //// COMMON CLEANUP
 void wxApp::CleanUp()
 {
   //// COMMON CLEANUP

+
+  // flush the logged messages if any
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL && pLog->HasPendingMessages() )
+    pLog->Flush();
+
+  // One last chance for pending objects to be cleaned up
+  wxTheApp->DeletePendingObjects();
+

   wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
   wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES


@@ -545,7 +554,7 @@ void wxApp::CleanUp()
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 
     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 


@@ -565,10 +574,10 @@ int wxEntry(WXHINSTANCE hInstance,
   // FIXME other compilers must support Win32 SEH (structured exception
   //       handling) too, just find the appropriate keyword in their docs!
   //       Please note that it's _not_ the same as C++ exceptions!
   // FIXME other compilers must support Win32 SEH (structured exception
   //       handling) too, just find the appropriate keyword in their docs!
   //       Please note that it's _not_ the same as C++ exceptions!

-#if !defined(__WXDEBUG__) && defined(_MSC_VER) && !defined(__MWERKS__)
+#if !defined(__WXDEBUG__) && defined(__VISUALC__)

     #define CATCH_PROGRAM_EXCEPTIONS
 
     #define CATCH_PROGRAM_EXCEPTIONS
 

-  __try {
+    __try {

 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif
 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif


@@ -608,6 +617,9 @@ int wxEntry(WXHINSTANCE hInstance,
       {
           retValue = wxTheApp->OnRun();
       }
       {
           retValue = wxTheApp->OnRun();
       }

+      else
+        // We want to initialize, but not run or exit immediately.
+        return 1;

   }
   //else: app initialization failed, so we skipped OnRun()
 
   }
   //else: app initialization failed, so we skipped OnRun()
 


@@ -630,12 +642,6 @@ int wxEntry(WXHINSTANCE hInstance,
 
   wxTheApp->OnExit();
 
 
   wxTheApp->OnExit();
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
-
-

   wxApp::CleanUp();
 
   return retValue;
   wxApp::CleanUp();
 
   return retValue;


@@ -656,7 +662,7 @@ int wxEntry(WXHINSTANCE hInstance,
 }
 
 // restore warning state
 }
 
 // restore warning state

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default: 4715) // not all control paths return a value
 #endif // Visual C++
 
     #pragma warning(default: 4715) // not all control paths return a value
 #endif // Visual C++
 


@@ -1123,6 +1129,6 @@ HINSTANCE wxGetInstance()
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.

-#if (defined(_MSC_VER) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))

   #include "main.cpp"
 #endif
   #include "main.cpp"
 #endif