log unknown log levels too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 5ab9ada4862ca32928da8c2b40e1f3fcd9d64073..cf99a8b954db07a1f1fc7fc18de14f5a9008a3aa 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -313,28 +313,27 @@ void wxLog::RemoveTraceMask(const wxString& str)
 
 void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {
 
 void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {

-    wxString str;
-

     switch ( level ) {
         case wxLOG_FatalError:
     switch ( level ) {
         case wxLOG_FatalError:

-            DoLogString(str << _("Fatal error: ") << szString, t);
+            DoLogString(wxString(_("Fatal error: ")) + szString, t);

             DoLogString(_("Program aborted."), t);
             Flush();
             abort();
             break;
 
         case wxLOG_Error:
             DoLogString(_("Program aborted."), t);
             Flush();
             abort();
             break;
 
         case wxLOG_Error:

-            DoLogString(str << _("Error: ") << szString, t);
+            DoLogString(wxString(_("Error: ")) + szString, t);

             break;
 
         case wxLOG_Warning:
             break;
 
         case wxLOG_Warning:

-            DoLogString(str << _("Warning: ") << szString, t);
+            DoLogString(wxString(_("Warning: ")) + szString, t);

             break;
 
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:
             break;
 
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:

-                DoLogString(str + szString, t);
+        default:    // log unknown log levels too
+                DoLogString(szString, t);

             // fall through
 
         case wxLOG_Status:
             // fall through
 
         case wxLOG_Status: