mime.types entries with all fields on same line parsed correctly

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 35add23be23e87e9c617295761b039adf51908a9..686cd757541e6a7abdd48db96adb2643a6884930 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -239,7 +239,14 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...)
 wxLog::wxLog()
 {
   m_bHasMessages = FALSE;
 wxLog::wxLog()
 {
   m_bHasMessages = FALSE;

-  m_bVerbose     = FALSE;
+
+  // enable verbose messages by default in the debug builds
+#ifdef __WXDEBUG__
+  m_bVerbose = TRUE;
+#else // release
+  m_bVerbose = FALSE;
+#endif // debug/release
+

   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
 }
 
   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
 }
 


@@ -330,8 +337,8 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
       break;
 
     case wxLOG_Info:
       break;
 
     case wxLOG_Info:

-      if ( GetVerbose() )

     case wxLOG_Message:
     case wxLOG_Message:

+      if ( GetVerbose() )

         DoLogString(str + szString);
       // fall through
 
         DoLogString(str + szString);
       // fall through
 


@@ -358,7 +365,7 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
 
 void wxLog::DoLogString(const char *WXUNUSED(szString))
 {
 
 void wxLog::DoLogString(const char *WXUNUSED(szString))
 {

-  wxFAIL_MSG(_("DoLogString must be overrided if it's called."));
+  wxFAIL_MSG("DoLogString must be overriden if it's called.");

 }
 
 void wxLog::Flush()
 }
 
 void wxLog::Flush()


@@ -380,9 +387,17 @@ wxLogStderr::wxLogStderr(FILE *fp)
 
 void wxLogStderr::DoLogString(const char *szString)
 {
 
 void wxLogStderr::DoLogString(const char *szString)
 {

-  fputs(szString, m_fp);
-  fputc('\n', m_fp);
+  wxString str(szString);
+  str << '\n';
+
+  fputs(str, m_fp);

   fflush(m_fp);
   fflush(m_fp);

+
+  // under Windows, programs usually don't have stderr at all, so make show the
+  // messages also under debugger
+#ifdef __WXMSW__
+    OutputDebugString(str + '\r');
+#endif // MSW

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -517,18 +532,14 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
               OutputDebugString(strTime + szString + "\n\r");
           #else  
             // send them to stderr
               OutputDebugString(strTime + szString + "\n\r");
           #else  
             // send them to stderr

-    /*

             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),
             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),

-                    level == wxLOG_Trace ? _("Trace") : _("Debug"),
-                    szString);
-     */
-            fprintf(stderr, "%s\n",
+                    level == wxLOG_Trace ? "Trace" : "Debug",

                     szString);
             fflush(stderr);
           #endif
         }
                     szString);
             fflush(stderr);
           #endif
         }

-      #endif
+      #endif // __WXDEBUG__

       break;
 
     case wxLOG_FatalError:
       break;
 
     case wxLOG_FatalError:


@@ -693,7 +704,14 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
   // -------------------------
   int nLines = m_pTextCtrl->GetNumberOfLines();
   for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
   // -------------------------
   int nLines = m_pTextCtrl->GetNumberOfLines();
   for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {

-    bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
+    bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + 
+// we're not going to pull in the whole wxTextFile if all we need is this...
+#if wxUSE_TEXTFILE
+                     wxTextFile::GetEOL()
+#else // !wxUSE_TEXTFILE
+                       '\n'
+#endif // wxUSE_TEXTFILE
+                    );

   }
 
   if ( bOk )
   }
 
   if ( bOk )


@@ -970,13 +988,24 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     // He-e-e-e-elp!! we're trapped in endless loop
     Trap();
 
     // He-e-e-e-elp!! we're trapped in endless loop
     Trap();
 

+    s_bInAssert = FALSE;
+

     return;
   }
 
   s_bInAssert = TRUE;
 
   char szBuf[LOG_BUFFER_SIZE];
     return;
   }
 
   s_bInAssert = TRUE;
 
   char szBuf[LOG_BUFFER_SIZE];

-  sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
+
+  // make life easier for people using VC++ IDE: clicking on the message will
+  // take us immediately to the place of the failed assert
+#ifdef __VISUALC__
+  sprintf(szBuf, "%s(%d): assert failed", szFile, nLine);
+#else  // !VC++
+  // make the error message more clear for all the others
+  sprintf(szBuf, "Assert failed in file %s at line %d", szFile, nLine);
+#endif // VC/!VC
+

   if ( szMsg != NULL ) {
     strcat(szBuf, ": ");
     strcat(szBuf, szMsg);
   if ( szMsg != NULL ) {
     strcat(szBuf, ": ");
     strcat(szBuf, szMsg);


@@ -989,12 +1018,12 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     // send it to the normal log destination
     wxLogDebug(szBuf);
 
     // send it to the normal log destination
     wxLogDebug(szBuf);
 

-    #ifdef wxUSE_NOGUI
+    #if wxUSE_NOGUI

       Trap();
     #else
       Trap();
     #else

-      strcat(szBuf, _("\nDo you want to stop the program?"
-                      "\nYou can also choose [Cancel] to suppress "
-                      "further warnings."));
+      strcat(szBuf, "\nDo you want to stop the program?"
+                    "\nYou can also choose [Cancel] to suppress "
+                    "further warnings.");

 
       switch ( wxMessageBox(szBuf, _("Debug"),
                             wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
 
       switch ( wxMessageBox(szBuf, _("Debug"),
                             wxYES_NO | wxCANCEL | wxICON_STOP ) ) {