speed optimizations: some functions now use wxString::Alloc, wxTextFile::Read

[wxWidgets.git] / include / wx / log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index a4840632454c08f472d85ae952b30cff0683b232..c70ab1a09bb22f69a9f505feeaf67cd0f60bf359 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -13,8 +13,8 @@
 #define   __LOGH__
 
 #ifdef    __GNUG__
-  #pragma interface
-#endif  //GNU C++
+#pragma interface "log.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // constants
@@ -42,7 +42,7 @@ enum
 #define wxTraceResAlloc 0x0004  // trace GDI resource allocation
 #define wxTraceRefCount 0x0008  // trace various ref counting operations
 
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
   #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 
@@ -196,12 +196,15 @@ class wxLogFrame;
 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:
-  wxLogWindow(const wxTString& strTitle);
+  wxLogWindow(const wxTString& strTitle, bool bShow = TRUE);
   ~wxLogWindow();
   
   // show/hide the log window
   void Show(bool bShow = TRUE);
 
+  // accessors
+  wxLog *GetOldLog() const { return m_pOldLog; }
+
 protected:
   virtual void DoLog(wxLogLevel level, const char *szString);
   virtual void DoLogString(const char *szString);
@@ -280,7 +283,7 @@ DECLARE_LOG_FUNCTION(SysError);
 void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...);
 
 // debug functions do nothing in release mode
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
   // NB: debug functions don't translate their arguments
   extern void WXDLLEXPORT wxLogDebug(const char *szFormat, ...);
 
@@ -291,8 +294,10 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...);
   extern void WXDLLEXPORT wxLogTrace(wxTraceMask mask,
                                      const char *szFormat, ...);
 #else   //!debug
-  #define wxLogDebug
-  #define wxLogTrace
+  // these functions do nothing
+  inline void wxLogDebug(const char *, ...) { }
+  inline void wxLogTrace(const char *, ...) { }
+  inline void wxLogTrace(wxTraceMask, const char *, ...) { }
 #endif
 
 
@@ -318,15 +323,15 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
   #define wxLogApiError(api, rc)                                              \
                     wxLogDebug("At %s(%d) '%s' failed with error %lx (%s).",  \
                                __FILE__, __LINE__, api,                       \
                                rc, wxSysErrorMsg(rc))
   #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 #else   //!debug
-  #define wxLogApiError(api, rc)
-  #define wxLogLastError(api)
+  inline void wxLogApiError(const char *, long) { }
+  inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 
 #endif  //__LOGH__