const added to GetBitmap it was my fault.

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

diff --git a/include/wx/log.h b/include/wx/log.h
index b5e608b77bd83e2af3a65aecfbe2e1f6ff47d68e..0c178347d97c90d603fc2c3292b0c23010832408 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -9,12 +9,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef   __LOGH__
-#define   __LOGH__
+#ifndef   _WX_LOG_H_
+#define   _WX_LOG_H_

 
 #ifdef    __GNUG__
 
 #ifdef    __GNUG__

-  #pragma interface
-#endif  //GNU C++
+#pragma interface "log.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -42,13 +42,21 @@ enum
 #define wxTraceResAlloc 0x0004  // trace GDI resource allocation
 #define wxTraceRefCount 0x0008  // trace various ref counting operations
 
 #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
 
 typedef unsigned long wxTraceMask;
 typedef unsigned long wxLogLevel;
 
   #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 
 typedef unsigned long wxTraceMask;
 typedef unsigned long wxLogLevel;
 

+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+class wxTextCtrl;
+class wxLogFrame;
+class wxFrame;
+class ostream;
+

 // ----------------------------------------------------------------------------
 // derive from this class to redirect (or suppress, or ...) log messages
 // normally, only a single instance of this class exists but it's not enforced
 // ----------------------------------------------------------------------------
 // derive from this class to redirect (or suppress, or ...) log messages
 // normally, only a single instance of this class exists but it's not enforced


@@ -61,24 +69,32 @@ public:
 
   // sink function
   static void OnLog(wxLogLevel level, const char *szString)
 
   // sink function
   static void OnLog(wxLogLevel level, const char *szString)

-    { if ( ms_pLogger != 0 ) ms_pLogger->DoLog(level, szString); }
+  {
+    wxLog *pLogger = GetActiveTarget();
+    if ( pLogger )
+    {
+      pLogger->DoLog(level, szString);
+    }
+  }

 
   // message buffering
     // flush shows all messages if they're not logged immediately
     // (FILE and iostream logs don't need it, but wxGuiLog does to avoid
     //  showing 17 modal dialogs one after another)
   virtual void Flush();
 
   // message buffering
     // flush shows all messages if they're not logged immediately
     // (FILE and iostream logs don't need it, but wxGuiLog does to avoid
     //  showing 17 modal dialogs one after another)
   virtual void Flush();

-    // call to Flush() may be optimized: call it only if this function 
+    // call to Flush() may be optimized: call it only if this function

     // returns true (although Flush() also returns immediately if there
     // is no messages, this functions is more efficient because inline)
   bool HasPendingMessages() const { return m_bHasMessages; }
 
   // only one sink is active at each moment
     // returns true (although Flush() also returns immediately if there
     // is no messages, this functions is more efficient because inline)
   bool HasPendingMessages() const { return m_bHasMessages; }
 
   // only one sink is active at each moment

-    // get current log target
+    // get current log target, will call wxApp::CreateLogTarget() to create one
+    // if none exists

   static wxLog *GetActiveTarget();
   static wxLog *GetActiveTarget();

-    // change log target, pLogger = NULL disables logging,
+    // change log target, pLogger = NULL disables logging. if bNoFlashOld is true,
+    // the old log target isn't flashed which might lead to loss of messages!

     // returns the previous log target
     // returns the previous log target

-  static wxLog *SetActiveTarget(wxLog *pLogger);
+  static wxLog *SetActiveTarget(wxLog *pLogger, bool bNoFlashOld = FALSE);

 
   // functions controlling the default wxLog behaviour
     // verbose mode is activated by standard command-line '-verbose' option
 
   // functions controlling the default wxLog behaviour
     // verbose mode is activated by standard command-line '-verbose' option


@@ -89,7 +105,10 @@ public:
     // NB: the string is not copied, so it's lifetime must be long enough!
   void SetTimeStampFormat(const char *szTF) { m_szTimeFormat = szTF; }
     // trace mask (see wxTraceXXX constants for details)
     // NB: the string is not copied, so it's lifetime must be long enough!
   void SetTimeStampFormat(const char *szTF) { m_szTimeFormat = szTF; }
     // trace mask (see wxTraceXXX constants for details)

-  void SetTraceMask(wxTraceMask ulMask) { m_ulTraceMask = ulMask; }
+  static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
+    // should GetActiveTarget() try to create a new log object if the current
+    // is NULL?
+  static void DontCreateOnDemand() { ms_bAutoCreate = FALSE; }

 
   // accessors
     // gets the verbose status
 
   // accessors
     // gets the verbose status


@@ -97,7 +116,7 @@ public:
     // get current time format
   const char *GetTimeStampFormat() const { return m_szTimeFormat; }
     // get trace mask
     // get current time format
   const char *GetTimeStampFormat() const { return m_szTimeFormat; }
     // get trace mask

-  wxTraceMask GetTraceMask() const { return m_ulTraceMask; }
+  static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }

 
   // make dtor virtual for all derived classes
   virtual ~wxLog() { }
 
   // make dtor virtual for all derived classes
   virtual ~wxLog() { }


@@ -107,7 +126,6 @@ protected:
 
   bool          m_bVerbose;     // FALSE => ignore LogInfo messages
   const char   *m_szTimeFormat; // format for strftime()
 
   bool          m_bVerbose;     // FALSE => ignore LogInfo messages
   const char   *m_szTimeFormat; // format for strftime()

-  wxTraceMask   m_ulTraceMask;  // controls wxLogTrace behaviour

 
   // the logging functions that can be overriden
     // default DoLog() prepends the time stamp and a prefix corresponding
 
   // the logging functions that can be overriden
     // default DoLog() prepends the time stamp and a prefix corresponding


@@ -116,12 +134,17 @@ protected:
     // default DoLogString does nothing but is not pure virtual because if
     // you override DoLog() you might not need it at all
   virtual void DoLogString(const char *szString);
     // default DoLogString does nothing but is not pure virtual because if
     // you override DoLog() you might not need it at all
   virtual void DoLogString(const char *szString);

-  
+
+  // helpers
+    // put the time stamp in the current format into the string
+  wxString TimeStamp() const;
+

 private:
   // static variables
   // ----------------
 private:
   // static variables
   // ----------------

-  static wxLog *ms_pLogger;       // currently active log sink
-  static bool   ms_bInitialized;  // any log targets created?
+  static wxLog      *ms_pLogger;      // currently active log sink
+  static bool        ms_bAutoCreate;  // automatically create new log targets?
+  static wxTraceMask ms_ulTraceMask;  // controls wxLogTrace behaviour

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -133,7 +156,7 @@ class WXDLLEXPORT wxLogStderr : public wxLog
 {
 public:
   // redirect log output to a FILE
 {
 public:
   // redirect log output to a FILE

-  wxLogStderr(FILE *fp = NULL);
+  wxLogStderr(FILE *fp = (FILE *) NULL);

 
 private:
   // implement sink function
 
 private:
   // implement sink function


@@ -143,11 +166,12 @@ private:
 };
 
 // log everything to an "ostream", cerr by default
 };
 
 // log everything to an "ostream", cerr by default

+class ostream;

 class WXDLLEXPORT wxLogStream : public wxLog
 {
 public:
   // redirect log output to an ostream
 class WXDLLEXPORT wxLogStream : public wxLog
 {
 public:
   // redirect log output to an ostream

-  wxLogStream(ostream *ostr = NULL);
+  wxLogStream(ostream *ostr = (ostream *) NULL);

 
 protected:
   // implement sink function
 
 protected:
   // implement sink function


@@ -158,7 +182,6 @@ protected:
 };
 
 // log everything to a text window (GUI only of course)
 };
 
 // log everything to a text window (GUI only of course)

-class wxTextCtrl;

 class WXDLLEXPORT wxLogTextCtrl : public wxLogStream
 {
 public:
 class WXDLLEXPORT wxLogTextCtrl : public wxLogStream
 {
 public:


@@ -192,26 +215,51 @@ protected:
 // to the log window. This window has it's own menu which allows the user to
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------
 // to the log window. This window has it's own menu which allows the user to
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------

-class wxLogFrame;

 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:
 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:

-  wxLogWindow(const wxTString& strTitle, bool bShow = TRUE);
+  wxLogWindow(wxFrame *pParent,         // the parent frame (can be NULL)
+              const char *szTitle,      // the title of the frame
+              bool bShow = TRUE,        // show window immediately?
+              bool bPassToOld = TRUE);  // pass log messages to the old target?

   ~wxLogWindow();
   ~wxLogWindow();

-  
-  // show/hide the log window
+
+  // window operations
+    // show/hide the log window

   void Show(bool bShow = TRUE);
   void Show(bool bShow = TRUE);

+    // retrieve the pointer to the frame
+  wxFrame *GetFrame() const;

 
   // accessors
 
   // accessors

+    // the previous log target (may be NULL)

   wxLog *GetOldLog() const { return m_pOldLog; }
   wxLog *GetOldLog() const { return m_pOldLog; }

+    // are we passing the messages to the previous log target?
+  bool IsPassingMessages() const { return m_bPassMessages; }
+
+  // we can pass the messages to the previous log target (we're in this mode by
+  // default: we collect all messages in the window, but also let the default
+  // processing take place)
+  void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; }
+
+  // base class virtuals
+    // we don't need it ourselves, but we pass it to the previous logger
+  virtual void Flush();
+
+  // overridables
+    // called immediately after the log frame creation allowing for
+    // any extra initializations
+  virtual void OnFrameCreate(wxFrame *frame);
+    // called right before the log frame is going to be deleted
+  virtual void OnFrameDelete(wxFrame *frame);

 
 protected:
   virtual void DoLog(wxLogLevel level, const char *szString);
   virtual void DoLogString(const char *szString);
 
 protected:
   virtual void DoLog(wxLogLevel level, const char *szString);
   virtual void DoLogString(const char *szString);

-  
+

 private:
 private:

-  wxLog      *m_pOldLog;    // previous log target
-  wxLogFrame *m_pLogFrame;  // the log frame
+  bool        m_bPassMessages;  // pass messages to m_pOldLog?
+  wxLog      *m_pOldLog;        // previous log target
+  wxLogFrame *m_pLogFrame;      // the log frame

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -235,7 +283,7 @@ class WXDLLEXPORT wxLogNull
 {
 public:
   // ctor saves old log target, dtor restores it
 {
 public:
   // ctor saves old log target, dtor restores it

-  wxLogNull() { m_pPrevLogger = wxLog::SetActiveTarget(NULL); }
+  wxLogNull() { m_pPrevLogger = wxLog::SetActiveTarget((wxLog *)NULL, TRUE); }

  ~wxLogNull() { (void)wxLog::SetActiveTarget(m_pPrevLogger);  }
 
 private:
  ~wxLogNull() { (void)wxLog::SetActiveTarget(m_pPrevLogger);  }
 
 private:


@@ -254,16 +302,13 @@ private:
 // define wxLog<level>
 // -------------------
 
 // define wxLog<level>
 // -------------------
 

-// NB: all these functions take `wxTString' and not
-//     `const wxTString&' because according to C++ standard
-//     the first argument to a vararg function can not be
-//     an array, function or reference :-(
-
-// the most generic log function
-void WXDLLEXPORT wxLogGeneric(wxLogLevel level, wxTString strFormat, ...);
-

 #define DECLARE_LOG_FUNCTION(level)                                 \
 #define DECLARE_LOG_FUNCTION(level)                                 \

-        extern void WXDLLEXPORT wxLog##level(wxTString strFormat, ...)
+        extern void WXDLLEXPORT wxLog##level(const char *szFormat, ...)
+#define DECLARE_LOG_FUNCTION2(level, arg1)                          \
+        extern void WXDLLEXPORT wxLog##level(arg1, const char *szFormat, ...)
+
+// a generic function for all levels (level is passes as parameter)
+DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level);

 
 // one function per each level
 DECLARE_LOG_FUNCTION(FatalError);
 
 // one function per each level
 DECLARE_LOG_FUNCTION(FatalError);


@@ -271,31 +316,38 @@ DECLARE_LOG_FUNCTION(Error);
 DECLARE_LOG_FUNCTION(Warning);
 DECLARE_LOG_FUNCTION(Message);
 DECLARE_LOG_FUNCTION(Info);
 DECLARE_LOG_FUNCTION(Warning);
 DECLARE_LOG_FUNCTION(Message);
 DECLARE_LOG_FUNCTION(Info);

-DECLARE_LOG_FUNCTION(Status);

 DECLARE_LOG_FUNCTION(Verbose);
 
 DECLARE_LOG_FUNCTION(Verbose);
 

+// this function sends the log message to the status line of the top level
+// application frame, if any
+DECLARE_LOG_FUNCTION(Status);
+
+// this one is the same as previous except that it allows to explicitly 
+// specify the frame to which the output should go
+DECLARE_LOG_FUNCTION2(Status, wxFrame *pFrame);
+

 // additional one: as wxLogError, but also logs last system call error code
 // and the corresponding error message if available
 DECLARE_LOG_FUNCTION(SysError);
 
 // and another one which also takes the error code (for those broken APIs
 // that don't set the errno (like registry APIs in Win32))
 // additional one: as wxLogError, but also logs last system call error code
 // and the corresponding error message if available
 DECLARE_LOG_FUNCTION(SysError);
 
 // and another one which also takes the error code (for those broken APIs
 // that don't set the errno (like registry APIs in Win32))

-void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...);
+DECLARE_LOG_FUNCTION2(SysError, long lErrCode);

 
 // debug functions do nothing in release mode
 
 // debug functions do nothing in release mode

-#ifdef  __DEBUG__
-  // NB: debug functions don't translate their arguments
-  extern void WXDLLEXPORT wxLogDebug(const char *szFormat, ...);
+#ifdef  __WXDEBUG__
+  DECLARE_LOG_FUNCTION(Debug);

 
   // first king of LogTrace is uncoditional: it doesn't check the level,
   // while the second one does nothing if all of level bits are not set
   // in wxLog::GetActive()->GetTraceMask().
 
   // first king of LogTrace is uncoditional: it doesn't check the level,
   // while the second one does nothing if all of level bits are not set
   // in wxLog::GetActive()->GetTraceMask().

-  extern void WXDLLEXPORT wxLogTrace(const char *szFormat, ...);
-  extern void WXDLLEXPORT wxLogTrace(wxTraceMask mask,
-                                     const char *szFormat, ...);
+  DECLARE_LOG_FUNCTION(Trace);
+  DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask);

 #else   //!debug
 #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
 
 
 #endif
 
 


@@ -321,15 +373,15 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------
 
 // 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)                                              \
                     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  //debug/!debug
 

-#endif  //__LOGH__
+#endif  // _WX_LOG_H_