implementation of the range insert for wxStringArray (patch 975003)

[wxWidgets.git] / src / common / appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 2917c634c1060ff2b873d6214c96f9bfdb6eb7d9..d15e4a5d415e8dc55bc86e2abfddd8a6c3b549c1 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -28,9 +28,7 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"

-    #if wxUSE_LOG
-        #include "wx/log.h"
-    #endif // wxUSE_LOG
+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #include "wx/utils.h"
 #endif //WX_PRECOMP
 
 #include "wx/utils.h"


@@ -130,6 +128,12 @@ wxAppConsole::~wxAppConsole()
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {

+    // If some code logged something before wxApp instance was created,
+    // wxLogStderr was set as the target. Undo it here by destroying the
+    // current target. It will be re-created next time logging is needed, but
+    // this time wxAppTraits will be used:
+    delete wxLog::SetActiveTarget(NULL);
+    

     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;
     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;


@@ -284,6 +288,10 @@ int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
     return -1;
 }
 
     return -1;
 }
 

+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+

 #if wxUSE_EXCEPTIONS
 
 void
 #if wxUSE_EXCEPTIONS
 
 void


@@ -295,6 +303,17 @@ wxAppConsole::HandleEvent(wxEvtHandler *handler,
     (handler->*func)(event);
 }
 
     (handler->*func)(event);
 }
 

+bool
+wxAppConsole::OnExceptionInMainLoop()
+{
+    throw;
+
+    // some compilers are too stupid to know that we never return after throw
+#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
+    return false;
+#endif
+}
+

 #endif // wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------


@@ -395,7 +414,7 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
                    lib.c_str(), progName.c_str(), prog.c_str());
 
         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
                    lib.c_str(), progName.c_str(), prog.c_str());
 

-        wxLogFatalError(msg);
+        wxLogFatalError(msg.c_str());

 
         // normally wxLogFatalError doesn't return
         return FALSE;
 
         // normally wxLogFatalError doesn't return
         return FALSE;


@@ -628,7 +647,7 @@ bool DoShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 

-    switch ( ::MessageBox(NULL, msgDlg, _T("wxWindows Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),

                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES: