Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index ac7d977062a77942fd5c40b09c87e7783626b500..da6f2948ef91b50a013fb373c7a3cbd80f4ac2ad 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -174,10 +173,6 @@ wxAppConsoleBase::~wxAppConsoleBase()
 
 bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 {
 
 bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 {

-#if wxUSE_INTL
-    GetTraits()->SetLocale();
-#endif // wxUSE_INTL
-

     return true;
 }
 
     return true;
 }
 


@@ -260,6 +255,10 @@ int wxAppConsoleBase::OnRun()
     return MainLoop();
 }
 
     return MainLoop();
 }
 

+void wxAppConsoleBase::OnLaunched()
+{    
+}
+

 int wxAppConsoleBase::OnExit()
 {
 #if wxUSE_CONFIG
 int wxAppConsoleBase::OnExit()
 {
 #if wxUSE_CONFIG


@@ -308,6 +307,15 @@ wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
     return app ? app->GetTraits() : NULL;
 }
 
     return app ? app->GetTraits() : NULL;
 }
 

+/* static */
+wxAppTraits& wxAppConsoleBase::GetValidTraits()
+{
+    static wxConsoleAppTraits s_traitsConsole;
+    wxAppTraits* const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+
+    return traits ? *traits : s_traitsConsole;
+}
+

 // ----------------------------------------------------------------------------
 // wxEventLoop redirection
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoop redirection
 // ----------------------------------------------------------------------------


@@ -316,6 +324,9 @@ int wxAppConsoleBase::MainLoop()
 {
     wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
 
 {
     wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
 

+    if (wxTheApp)
+        wxTheApp->OnLaunched();
+    

     return m_mainLoop ? m_mainLoop->Run() : -1;
 }
 
     return m_mainLoop ? m_mainLoop->Run() : -1;
 }
 


@@ -784,6 +795,18 @@ void wxAppConsoleBase::OnAssert(const wxChar *file,
     OnAssertFailure(file, line, NULL, cond, msg);
 }
 
     OnAssertFailure(file, line, NULL, cond, msg);
 }
 

+// ----------------------------------------------------------------------------
+// Miscellaneous other methods
+// ----------------------------------------------------------------------------
+
+void wxAppConsoleBase::SetCLocale()
+{
+    // We want to use the user locale by default in GUI applications in order
+    // to show the numbers, dates &c in the familiar format -- and also accept
+    // this format on input (especially important for decimal comma/dot).
+    wxSetlocale(LC_ALL, "");
+}
+

 // ============================================================================
 // other classes implementations
 // ============================================================================
 // ============================================================================
 // other classes implementations
 // ============================================================================


@@ -836,26 +859,6 @@ bool wxConsoleAppTraitsBase::HasStderr()
 // wxAppTraits
 // ----------------------------------------------------------------------------
 
 // wxAppTraits
 // ----------------------------------------------------------------------------
 

-#if wxUSE_INTL
-void wxAppTraitsBase::SetLocale()
-{
-    // We want to use the user locale by default in GUI applications in order
-    // to show the numbers, dates &c in the familiar format -- and also accept
-    // this format on input (especially important for decimal comma/dot).
-    wxSetlocale(LC_ALL, "");
-
-#if wxUSE_STL
-    // At least in some environments, e.g. MinGW-64, if the global C++ locale
-    // is different from the global C locale, all stream operations temporarily
-    // change the locale resulting in a huge slowdown (3 times slower in some
-    // real-life applications), so change the C++ locale to match.
-    std::locale::global(std::locale(""));
-#endif  //wxUSE_STL
-
-    wxUpdateLocaleIsUtf8();
-}
-#endif
-

 #if wxUSE_THREADS
 void wxMutexGuiEnterImpl();
 void wxMutexGuiLeaveImpl();
 #if wxUSE_THREADS
 void wxMutexGuiEnterImpl();
 void wxMutexGuiLeaveImpl();


@@ -1031,6 +1034,8 @@ void wxAbort()
 #if wxDEBUG_LEVEL
 
 // break into the debugger
 #if wxDEBUG_LEVEL
 
 // break into the debugger

+#ifndef wxTrap
+

 void wxTrap()
 {
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
 void wxTrap()
 {
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)


@@ -1044,6 +1049,8 @@ void wxTrap()
 #endif // Win/Unix
 }
 
 #endif // Win/Unix
 }
 

+#endif // wxTrap already defined as a macro
+

 // default assert handler
 static void
 wxDefaultAssertHandler(const wxString& file,
 // default assert handler
 static void
 wxDefaultAssertHandler(const wxString& file,


@@ -1193,6 +1200,8 @@ static void LINKAGEMODE SetTraceMasks()
 
 #if wxDEBUG_LEVEL
 
 
 #if wxDEBUG_LEVEL
 

+bool wxTrapInAssert = false;
+

 static
 bool DoShowAssertDialog(const wxString& msg)
 {
 static
 bool DoShowAssertDialog(const wxString& msg)
 {


@@ -1211,7 +1220,14 @@ bool DoShowAssertDialog(const wxString& msg)
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:

-            wxTrap();
+            // If we called wxTrap() directly from here, the programmer would
+            // see this function and a few more calls between his own code and
+            // it in the stack trace which would be perfectly useless and often
+            // confusing. So instead just set the flag here and let the macros
+            // defined in wx/debug.h call wxTrap() themselves, this ensures
+            // that the debugger will show the line in the user code containing
+            // the failing assert.
+            wxTrapInAssert = true;

             break;
 
         case IDCANCEL:
             break;
 
         case IDCANCEL: