Fixed implementation pragma to "utils.h"

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

diff --git a/include/wx/log.h b/include/wx/log.h
index a4840632454c08f472d85ae952b30cff0683b232..bad161e60f911b332a3d907f31fa71eae1b6c871 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
@@ -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, ...);
 
@@ -318,7 +321,7 @@ 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,                       \