X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..eebb848a8516e14cb6c23e1c7b9db56af375733f:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 35add23be2..03267bf2d3 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -330,8 +330,8 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
       break;
 
     case wxLOG_Info:
-      if ( GetVerbose() )
     case wxLOG_Message:
+      if ( GetVerbose() )
         DoLogString(str + szString);
       // fall through
 
@@ -693,7 +693,14 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
   // -------------------------
   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 )
@@ -976,7 +983,16 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
   s_bInAssert = TRUE;
 
   char szBuf[LOG_BUFFER_SIZE];
+
+  // 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);
@@ -989,7 +1005,7 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     // send it to the normal log destination
     wxLogDebug(szBuf);
 
-    #ifdef wxUSE_NOGUI
+    #if wxUSE_NOGUI
       Trap();
     #else
       strcat(szBuf, _("\nDo you want to stop the program?"