X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fd239ad61686946e7c3455d24089a2d985a9561..401ec7b639629b0c316f84b26d52897829dcf609:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 5c4b30f179..62a70119a0 100644
--- 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>
@@ -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, ...)                    \
   {                                                               \
@@ -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,7 +291,7 @@ 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)
@@ -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,7 +448,7 @@ 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");
@@ -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
@@ -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,7 +809,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
 // debug helper
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
 
 // this function is called when an assert fails
 void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
@@ -831,7 +838,7 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     switch ( wxMessageBox(szBuf, _("Debug"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
       case wxYES:
-        #ifdef __WINDOWS__
+        #ifdef __WXMSW__
           DebugBreak();
         #else // Unix
           raise(SIGTRAP);
@@ -847,5 +854,5 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
   }
 }
 
-#endif  //DEBUG
+#endif  //WXDEBUG