Added wxString version of wxStripExtension; changed OnClose to return TRUE;

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 5c4b30f179221e4be41b5a2887bb544fd2ae4cde..08436bececdfc8e658304a8bf7eba44082f18b96 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -47,7 +47,7 @@
 #include  <stdlib.h>
 #include  <time.h>
 
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
   #include  <windows.h>
 #else   //Unix
   #include  <signal.h>
@@ -83,12 +83,12 @@
 static char s_szBuf[LOG_BUFFER_SIZE];
 
 // generic log function
-void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...)
+void wxLogGeneric(wxLogLevel level, const char *szFormat, ...)
 {
   if ( wxLog::GetActiveTarget() != NULL ) {
     va_list argptr;
-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, szFormat);
+    vsprintf(s_szBuf, szFormat, argptr);
     va_end(argptr);
 
     wxLog::OnLog(level, s_szBuf);
@@ -96,12 +96,12 @@ void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...)
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                             \
-  void wxLog##level(wxTString strFormat, ...)                     \
+  void wxLog##level(const char *szFormat, ...)                    \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
       va_list argptr;                                             \
-      va_start(argptr, strFormat);                                \
-      vsprintf(s_szBuf, strFormat, argptr);                       \
+      va_start(argptr, szFormat);                                 \
+      vsprintf(s_szBuf, szFormat, argptr);                        \
       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf);                       \
@@ -116,13 +116,13 @@ IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
 // same as info, but only if 'verbose' mode is on
-void wxLogVerbose(wxTString strFormat, ...)
+void wxLogVerbose(const char *szFormat, ...)
 {
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL && pLog->GetVerbose() ) {
     va_list argptr;
-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, szFormat);
+    vsprintf(s_szBuf, szFormat, argptr);
     va_end(argptr);
 
     wxLog::OnLog(wxLOG_Info, s_szBuf);
@@ -130,7 +130,7 @@ void wxLogVerbose(wxTString strFormat, ...)
 }
 
 // debug functions
-#ifdef __DEBUG__
+#ifdef __WXDEBUG__
 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \
   void wxLog##level(const char *szFormat, ...)                    \
   {                                                               \
@@ -181,21 +181,21 @@ void wxLogSysErrorHelper(long lErrCode)
   wxLog::OnLog(wxLOG_Error, s_szBuf);
 }
 
-void WXDLLEXPORT wxLogSysError(wxTString strFormat, ...)
+void WXDLLEXPORT wxLogSysError(const char *szFormat, ...)
 {
   va_list argptr;
-  va_start(argptr, strFormat);
-  vsprintf(s_szBuf, strFormat, argptr);
+  va_start(argptr, szFormat);
+  vsprintf(s_szBuf, szFormat, argptr);
   va_end(argptr);
 
   wxLogSysErrorHelper(wxSysErrorCode());
 }
 
-void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...)
+void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...)
 {
   va_list argptr;
-  va_start(argptr, strFormat);
-  vsprintf(s_szBuf, strFormat, argptr);
+  va_start(argptr, szFormat);
+  vsprintf(s_szBuf, szFormat, argptr);
   va_end(argptr);
 
   wxLogSysErrorHelper(lErrCode);
@@ -210,7 +210,7 @@ wxLog::wxLog()
   m_bHasMessages = FALSE;
   m_bVerbose     = FALSE;
   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
-  m_ulTraceMask  = (wxTraceMask)-1;        // set all bits
+  m_ulTraceMask  = (wxTraceMask)0;        // -1 to set all bits
 }
 
 wxLog *wxLog::GetActiveTarget() 
@@ -291,13 +291,13 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
 
     case wxLOG_Trace:
     case wxLOG_Debug:
-      #ifdef __DEBUG__
+      #ifdef __WXDEBUG__
         #ifdef  __WIN32__
           // in addition to normal logging, also send the string to debugger
           // (don't prepend "Debug" here: it will go to debug window anyhow)
           ::OutputDebugString(str + szString + "\n\r");
         #endif  //Win32
-        DoLogString(str << (level == wxLOG_Trace ? "Trace" : "Debug")
+        DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
                         << ": " << szString);
       #endif
             
@@ -359,7 +359,7 @@ void wxLogStream::DoLogString(const char *szString)
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __GTK__
+#ifndef __WXGTK__
              : wxLogStream(new ostream(pTextCtrl))
 #endif //GTK
 {
@@ -367,7 +367,7 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {
-  #ifndef __GTK__
+  #ifndef __WXGTK__
     delete m_ostr;
   #endif //GTK
 }
@@ -448,14 +448,14 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
 
     case wxLOG_Trace:
     case wxLOG_Debug:
-      #ifdef __DEBUG__
+      #ifdef __WXDEBUG__
         #ifdef  __WIN32__
           OutputDebugString(szString);
           OutputDebugString("\n\r");
         #else   //!WIN32
           // send them to stderr
-          fprintf(stderr, level == wxLOG_Trace ? "Trace: %s\n" 
-                                               : "Debug: %s\n", szString);
+          fprintf(stderr, "%s: %s\n",
+                  level == wxLOG_Trace ? _("Trace") : _("Debug"), szString);
           fflush(stderr);
         #endif  // WIN32
       #endif
@@ -463,7 +463,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
 
     case wxLOG_FatalError:
       // show this one immediately
-      wxMessageBox(szString, "Fatal error", wxICON_HAND);
+      wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
       break;
 
     case wxLOG_Error:
@@ -496,6 +496,7 @@ public:
 
   // menu callbacks
   void OnClose(wxCommandEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
   void OnSave (wxCommandEvent& event);
   void OnClear(wxCommandEvent& event);
 
@@ -521,7 +522,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
   EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
   EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
-  EVT_CLOSE(wxLogFrame::OnClose)
+  EVT_CLOSE(wxLogFrame::OnCloseWindow)
 END_EVENT_TABLE() 
 
 wxLogFrame::wxLogFrame(const char *szTitle)
@@ -563,6 +564,12 @@ void wxLogFrame::OnClose(wxCommandEvent& event)
   Show(FALSE);
 }
 
+void wxLogFrame::OnCloseWindow(wxCloseEvent& event)
+{
+  // just hide the window
+  Show(FALSE);
+}
+
 void wxLogFrame::OnSave(wxCommandEvent& event)
 {
   // get the file name
@@ -612,7 +619,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
   // retrieve text and save it
   // -------------------------
   
-#ifdef __GTK__
+#ifdef __WXGTK__
   // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
   wxLogError("Sorry, this function is not implemented under GTK");
 #else
@@ -626,7 +633,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
     bOk = file.Close();
 
   if ( !bOk ) {
-    wxLogError("Can't save log contents to file.");
+    wxLogError(_("Can't save log contents to file."));
     return;
   }
 }
@@ -636,10 +643,10 @@ void wxLogFrame::OnClear(wxCommandEvent& event)
   m_pTextCtrl->Clear();
 }
 
-wxLogWindow::wxLogWindow(const wxTString& strTitle, bool bShow)
+wxLogWindow::wxLogWindow(const char *szTitle, bool bShow)
 {
   m_pOldLog = wxLog::GetActiveTarget();
-  m_pLogFrame = new wxLogFrame(strTitle);
+  m_pLogFrame = new wxLogFrame(szTitle);
   
   if ( bShow )
     m_pLogFrame->Show(TRUE);
@@ -671,7 +678,7 @@ void wxLogWindow::DoLogString(const char *szString)
   wxTextCtrl *pText = m_pLogFrame->TextCtrl();
 
   // remove selection (WriteText is in fact ReplaceSelection)
-  #ifdef __WINDOWS__
+  #ifdef __WXMSW__
     long nLen = pText->GetLastPosition();
     pText->SetSelection(nLen, nLen);
   #endif // Windows
@@ -744,7 +751,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 // get error code from syste
 unsigned long wxSysErrorCode()
 {
-  #ifdef  __WINDOWS__
+  #ifdef  __WXMSW__
     #ifdef  __WIN32__
       return ::GetLastError();
     #else   //WIN16
@@ -762,7 +769,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
   if ( nErrCode == 0 )
     nErrCode = wxSysErrorCode();
 
-  #ifdef  __WINDOWS__
+  #ifdef  __WXMSW__
     #ifdef  __WIN32__
       static char s_szBuf[LOG_BUFFER_SIZE / 2];
 
@@ -802,13 +809,30 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
 // debug helper
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
+
+void Trap()
+{
+  #ifdef __WXMSW__
+    DebugBreak();
+  #else // Unix
+    raise(SIGTRAP);
+  #endif // Win/Unix
+}
 
 // this function is called when an assert fails
 void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
 {
   // this variable can be set to true to suppress "assert failure" messages
-  static s_bNoAsserts = FALSE;
+  static bool s_bNoAsserts = FALSE;
+  static bool s_bInAssert = FALSE;
+
+  if ( s_bInAssert ) {
+    // He-e-e-e-elp!! we're trapped in endless loop
+    Trap();
+  }
+
+  s_bInAssert = TRUE;
 
   char szBuf[LOG_BUFFER_SIZE];
   sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
@@ -831,11 +855,7 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     switch ( wxMessageBox(szBuf, _("Debug"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
       case wxYES:
-        #ifdef __WINDOWS__
-          DebugBreak();
-        #else // Unix
-          raise(SIGTRAP);
-        #endif // Win/Unix
+        Trap();
         break;
 
       case wxCANCEL:
@@ -845,7 +865,9 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
       //case wxNO: nothing to do
     }
   }
+
+  s_bInAssert = FALSE;
 }
 
-#endif  //DEBUG
+#endif  //WXDEBUG