fixing wrong version commit

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

diff --git a/interface/wx/log.h b/interface/wx/log.h
index bb96ae292640ed8cc2b1a23deaed7ce6baf8e3f7..04f57638d4bf001f84287f93ee5ad6b1d6e03a9a 100644 (file)
--- a/interface/wx/log.h
+++ b/interface/wx/log.h
@@ -6,9 +6,70 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+
+/**
+    Different standard log levels (you may also define your own) used with
+    by standard wxLog functions wxLogError(), wxLogWarning(), etc...
+*/
+enum wxLogLevelValues
+{
+    wxLOG_FatalError, //!< program can't continue, abort immediately
+    wxLOG_Error,      //!< a serious error, user must be informed about it
+    wxLOG_Warning,    //!< user is normally informed about it but may be ignored
+    wxLOG_Message,    //!< normal message (i.e. normal output of a non GUI app)
+    wxLOG_Status,     //!< informational: might go to the status line of GUI app
+    wxLOG_Info,       //!< informational message (a.k.a. 'Verbose')
+    wxLOG_Debug,      //!< never shown to the user, disabled in release mode
+    wxLOG_Trace,      //!< trace messages are also only enabled in debug mode
+    wxLOG_Progress,   //!< used for progress indicator (not yet)
+    wxLOG_User = 100, //!< user defined levels start here
+    wxLOG_Max = 10000
+};
+
+/**
+    The type used to specify a log level.
+
+    Default values of ::wxLogLevel used by wxWidgets are contained in the
+    ::wxLogLevelValues enumeration.
+*/
+typedef unsigned long wxLogLevel;
+
+/**
+    Information about a log record (unit of the log output).
+ */
+class wxLogRecordInfo
+{
+public:
+    /// The name of the file where this log message was generated.
+    const char *filename;
+
+    /// The line number at which this log message was generated.
+    int line;
+
+    /**
+        The name of the function where the log record was generated.
+
+        This field may be @NULL if the compiler doesn't support @c __FUNCTION__
+        (but most modern compilers do).
+     */
+    const char *func;
+
+    /// Time when the log message was generated.
+    time_t timestamp;
+
+    /**
+        Id of the thread in which the message was generated.
+
+        This field is only available if wxWidgets was built with threads
+        support (<code>wxUSE_THREADS == 1</code>).
+
+        @see wxThread::GetCurrentId()
+     */
+    wxThreadIdType threadId;
+};
+

 /**
     @class wxLogWindow
 /**
     @class wxLogWindow

-    @wxheader{log.h}

 
     This class represents a background log window: to be precise, it collects all
     log messages in the log frame which it manages but also passes them on to the
 
     This class represents a background log window: to be precise, it collects all
     log messages in the log frame which it manages but also passes them on to the


@@ -27,9 +88,9 @@ public:
     /**
         Creates the log frame window and starts collecting the messages in it.
 
     /**
         Creates the log frame window and starts collecting the messages in it.
 

-        @param parent
+        @param pParent

             The parent window for the log frame, may be @NULL
             The parent window for the log frame, may be @NULL

-        @param title
+        @param szTitle

             The title for the log frame
         @param show
             @true to show the frame initially (default), otherwise
             The title for the log frame
         @param show
             @true to show the frame initially (default), otherwise


@@ -39,7 +100,7 @@ public:
             logging them in the log frame (default), @false to only log them in the
             log frame.
     */
             logging them in the log frame (default), @false to only log them in the
             log frame.
     */

-    wxLogWindow(wxFrame parent, const wxChar title, bool show = true,
+    wxLogWindow(wxWindow* pParent, const wxString& szTitle, bool show = true,

                 bool passToOld = true);
 
     /**
                 bool passToOld = true);
 
     /**


@@ -52,24 +113,25 @@ public:
         Called if the user closes the window interactively, will not be
         called if it is destroyed for another reason (such as when program
         exits).
         Called if the user closes the window interactively, will not be
         called if it is destroyed for another reason (such as when program
         exits).

+

         Return @true from here to allow the frame to close, @false to
         prevent this from happening.
 
         @see OnFrameDelete()
     */
         Return @true from here to allow the frame to close, @false to
         prevent this from happening.
 
         @see OnFrameDelete()
     */

-    virtual bool OnFrameClose(wxFrame frame);
+    virtual bool OnFrameClose(wxFrame* frame);

 
     /**
         Called immediately after the log frame creation allowing for
         any extra initializations.
     */
 
     /**
         Called immediately after the log frame creation allowing for
         any extra initializations.
     */

-    virtual void OnFrameCreate(wxFrame frame);
+    virtual void OnFrameCreate(wxFrame* frame);

 
     /**
         Called right before the log frame is going to be deleted: will
         always be called unlike OnFrameClose().
     */
 
     /**
         Called right before the log frame is going to be deleted: will
         always be called unlike OnFrameClose().
     */

-    virtual void OnFrameDelete(wxFrame frame);
+    virtual void OnFrameDelete(wxFrame* frame);

 
     /**
         Shows or hides the frame.
 
     /**
         Shows or hides the frame.


@@ -81,18 +143,14 @@ public:
 
 /**
     @class wxLogInterposerTemp
 
 /**
     @class wxLogInterposerTemp

-    @wxheader{log.h}

 
 

-    A special version of wxLogChain which uses itself as the
-    new log target. It forwards log messages to the previously installed one in
-    addition to
-    processing them itself. Unlike wxLogInterposer, it doesn't
-    delete the old target which means it can be used to temporarily redirect log
-    output.
+    A special version of wxLogChain which uses itself as the new log target.
+    It forwards log messages to the previously installed one in addition to
+    processing them itself. Unlike wxLogInterposer, it doesn't delete the old
+    target which means it can be used to temporarily redirect log output.

 
     As per wxLogInterposer, this class must be derived from to implement
 
     As per wxLogInterposer, this class must be derived from to implement

-    wxLog::DoLog
-    and/or wxLog::DoLogString methods.
+    wxLog::DoLog and/or wxLog::DoLogString methods.

 
     @library{wxbase}
     @category{logging}
 
     @library{wxbase}
     @category{logging}


@@ -103,13 +161,13 @@ public:
     /**
         The default constructor installs this object as the current active log target.
     */
     /**
         The default constructor installs this object as the current active log target.
     */

+    wxLogInterposerTemp();

 };
 
 
 
 /**
     @class wxLogChain
 };
 
 
 
 /**
     @class wxLogChain

-    @wxheader{log.h}

 
     This simple class allows you to chain log sinks, that is to install a new sink but
     keep passing log messages to the old one instead of replacing it completely as
 
     This simple class allows you to chain log sinks, that is to install a new sink but
     keep passing log messages to the old one instead of replacing it completely as


@@ -129,7 +187,7 @@ public:
 
     // don't delete logChain directly as this would leave a dangling
     // pointer as active log target, use SetActiveTarget() instead
 
     // don't delete logChain directly as this would leave a dangling
     // pointer as active log target, use SetActiveTarget() instead

-    delete wxLog::SetActiveTarget(...something else or @NULL...);
+    delete wxLog::SetActiveTarget(...something else or NULL...);

     @endcode
 
     @library{wxbase}
     @endcode
 
     @library{wxbase}


@@ -147,7 +205,7 @@ public:
     /**
         Destroys the previous log target.
     */
     /**
         Destroys the previous log target.
     */

-    ~wxLogChain();
+    virtual ~wxLogChain();

 
     /**
         Detaches the old log target so it won't be destroyed when the wxLogChain object
 
     /**
         Detaches the old log target so it won't be destroyed when the wxLogChain object


@@ -162,8 +220,7 @@ public:
 
     /**
         Returns @true if the messages are passed to the previously active log
 
     /**
         Returns @true if the messages are passed to the previously active log

-        target (default) or @false if PassMessages()
-        had been called.
+        target (default) or @false if PassMessages() had been called.

     */
     bool IsPassingMessages() const;
 
     */
     bool IsPassingMessages() const;
 


@@ -176,9 +233,10 @@ public:
     void PassMessages(bool passMessages);
 
     /**
     void PassMessages(bool passMessages);
 
     /**

-        Sets another log target to use (may be @NULL). The log target specified
-        in the wxLogChain(wxLog*) constructor or in a previous call to
-        this function is deleted.
+        Sets another log target to use (may be @NULL).
+
+        The log target specified in the wxLogChain(wxLog*) constructor or in a
+        previous call to this function is deleted.

         This doesn't change the old log target value (the one the messages are
         forwarded to) which still remains the same as was active when wxLogChain
         object was created.
         This doesn't change the old log target value (the one the messages are
         forwarded to) which still remains the same as was active when wxLogChain
         object was created.


@@ -190,13 +248,51 @@ public:
 
 /**
     @class wxLogGui
 
 /**
     @class wxLogGui

-    @wxheader{log.h}

 
 

-    This is the default log target for the GUI wxWidgets applications. It is passed
-    to wxLog::SetActiveTarget at the program
-    startup and is deleted by wxWidgets during the program shut down.
+    This is the default log target for the GUI wxWidgets applications.
+
+    Please see @ref overview_log_customize for explanation of how to change the
+    default log target.
+
+    An object of this class is used by default to show the log messages created
+    by using wxLogMessage(), wxLogError() and other logging functions. It
+    doesn't display the messages logged by them immediately however but
+    accumulates all messages logged during an event handler execution and then
+    shows them all at once when its Flush() method is called during the idle
+    time processing. This has the important advantage of showing only a single
+    dialog to the user even if several messages were logged because of a single
+    error as it often happens (e.g. a low level function could log a message
+    because it failed to open a file resulting in its caller logging another
+    message due to the failure of higher level operation requiring the use of
+    this file). If you need to force the display of all previously logged
+    messages immediately you can use wxLog::FlushActive() to force the dialog
+    display.
+
+    Also notice that if an error message is logged when several informative
+    messages had been already logged before, the informative messages are
+    discarded on the assumption that they are not useful -- and may be
+    confusing and hence harmful -- any more after the error. The warning
+    and error messages are never discarded however and any informational
+    messages logged after the first error one are also kept (as they may
+    contain information about the error recovery). You may override DoLog()
+    method to change this behaviour.
+
+    At any rate, it is possible that that several messages were accumulated
+    before this class Flush() method is called. If this is the case, Flush()
+    uses a custom dialog which shows the last message directly and allows the
+    user to view the previously logged ones by expanding the "Details"
+    wxCollapsiblePane inside it. This custom dialog also provides the buttons
+    for copying the log messages to the clipboard and saving them to a file.
+
+    However if only a single message is present when Flush() is called, just a
+    wxMessageBox() is used to show it. This has the advantage of being closer
+    to the native behaviour but it doesn't give the user any possibility to
+    copy or save the message (except for the recent Windows versions where @c
+    Ctrl-C may be pressed in the message box to copy its contents to the
+    clipboard) so you may want to override DoShowSingleMessage() to customize
+    wxLogGui -- the dialogs sample shows how to do this.

 
 

-    @library{wxbase}
+    @library{wxcore}

     @category{logging}
 */
 class wxLogGui : public wxLog
     @category{logging}
 */
 class wxLogGui : public wxLog


@@ -206,13 +302,144 @@ public:
         Default constructor.
     */
     wxLogGui();
         Default constructor.
     */
     wxLogGui();

+
+    /**
+        Presents the accumulated log messages, if any, to the user.
+
+        This method is called during the idle time and should show any messages
+        accumulated in wxLogGui#m_aMessages field to the user.
+     */
+    virtual void Flush();
+
+protected:
+    /**
+        Returns the appropriate title for the dialog.
+
+        The title is constructed from wxApp::GetAppDisplayName() and the
+        severity string (e.g. "error" or "warning") appropriate for the current
+        wxLogGui#m_bErrors and wxLogGui#m_bWarnings values.
+     */
+    wxString GetTitle() const;
+
+    /**
+        Returns wxICON_ERROR, wxICON_WARNING or wxICON_INFORMATION depending on
+        the current maximal severity.
+
+        This value is suitable to be used in the style parameter of
+        wxMessageBox() function.
+     */
+    int GetSeverityIcon() const;
+
+    /**
+        Forgets all the currently stored messages.
+
+        If you override Flush() (and don't call the base class version), you
+        must call this method to avoid messages being logged over and over
+        again.
+     */
+    void Clear();
+
+
+    /**
+        Method called by Flush() to show a single log message.
+
+        This function can be overridden to show the message in a different way.
+        By default a simple wxMessageBox() call is used.
+
+        @param message
+            The message to show (it can contain multiple lines).
+        @param title
+            The suggested title for the dialog showing the message, see
+            GetTitle().
+        @param style
+            One of @c wxICON_XXX constants, see GetSeverityIcon().
+     */
+    virtual void DoShowSingleLogMessage(const wxString& message,
+                                        const wxString& title,
+                                        int style);
+
+    /**
+        Method called by Flush() to show multiple log messages.
+
+        This function can be overridden to show the messages in a different way.
+        By default a special log dialog showing the most recent message and
+        allowing the user to expand it to view the previously logged ones is
+        used.
+
+        @param messages
+            Array of messages to show; it contains more than one element.
+        @param severities
+            Array of message severities containing @c wxLOG_XXX values.
+        @param times
+            Array of time_t values indicating when each message was logged.
+        @param title
+            The suggested title for the dialog showing the message, see
+            GetTitle().
+        @param style
+            One of @c wxICON_XXX constants, see GetSeverityIcon().
+     */
+    virtual void DoShowMultipleLogMessages(const wxArrayString& messages,
+                                           const wxArrayInt& severities,
+                                           const wxArrayLong& times,
+                                           const wxString& title,
+                                           int style);
+
+
+    /**
+        All currently accumulated messages.
+
+        This array may be empty if no messages were logged.
+
+        @see m_aSeverity, m_aTimes
+     */
+    wxArrayString m_aMessages;
+
+    /**
+        The severities of each logged message.
+
+        This array is synchronized with wxLogGui#m_aMessages, i.e. the n-th
+        element of this array corresponds to the severity of the n-th message.
+        The possible severity values are @c wxLOG_XXX constants, e.g.
+        wxLOG_Error, wxLOG_Warning, wxLOG_Message etc.
+     */
+    wxArrayInt m_aSeverity;
+
+    /**
+        The time stamps of each logged message.
+
+        The elements of this array are time_t values corresponding to the time
+        when the message was logged.
+     */
+    wxArrayLong m_aTimes;
+
+    /**
+        True if there any error messages.
+     */
+    bool m_bErrors;
+
+    /**
+        True if there any warning messages.
+
+        If both wxLogGui#m_bErrors and this member are false, there are only
+        informational messages to be shown.
+     */
+    bool m_bWarnings;
+
+    /**
+        True if there any messages to be shown to the user.
+
+        This variable is used instead of simply checking whether
+        wxLogGui#m_aMessages array is empty to allow blocking further calls to
+        Flush() while a log dialog is already being shown, even if the messages
+        array hasn't been emptied yet.
+     */
+    bool m_bHasMessages;

 };
 
 
 
 /**
     @class wxLogStream
 };
 
 
 
 /**
     @class wxLogStream

-    @wxheader{log.h}

 
     This class can be used to redirect the log messages to a C++ stream.
 
 
     This class can be used to redirect the log messages to a C++ stream.
 


@@ -231,18 +458,19 @@ public:
         Constructs a log target which sends all the log messages to the given
         output stream. If it is @NULL, the messages are sent to @c cerr.
     */
         Constructs a log target which sends all the log messages to the given
         output stream. If it is @NULL, the messages are sent to @c cerr.
     */

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

 };
 
 
 
 /**
     @class wxLogStderr
 };
 
 
 
 /**
     @class wxLogStderr

-    @wxheader{log.h}

 
     This class can be used to redirect the log messages to a C file stream (not to
 
     This class can be used to redirect the log messages to a C file stream (not to

-    be confused with C++ streams). It is the default log target for the non-GUI
-    wxWidgets applications which send all the output to @c stderr.
+    be confused with C++ streams).
+
+    It is the default log target for the non-GUI wxWidgets applications which
+    send all the output to @c stderr.

 
     @library{wxbase}
     @category{logging}
 
     @library{wxbase}
     @category{logging}


@@ -256,14 +484,13 @@ public:
         Constructs a log target which sends all the log messages to the given
         @c FILE. If it is @NULL, the messages are sent to @c stderr.
     */
         Constructs a log target which sends all the log messages to the given
         @c FILE. If it is @NULL, the messages are sent to @c stderr.
     */

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

 };
 
 
 
 /**
     @class wxLogBuffer
 };
 
 
 
 /**
     @class wxLogBuffer

-    @wxheader{log.h}

 
     wxLogBuffer is a very simple implementation of log sink which simply collects
     all the logged messages in a string (except the debug messages which are output
 
     wxLogBuffer is a very simple implementation of log sink which simply collects
     all the logged messages in a string (except the debug messages which are output


@@ -272,8 +499,7 @@ public:
     by the new lines.
 
     All the messages collected so far can be shown to the user (and the current
     by the new lines.
 
     All the messages collected so far can be shown to the user (and the current

-    buffer cleared) by calling the overloaded wxLogBuffer::Flush
-    method.
+    buffer cleared) by calling the overloaded wxLogBuffer::Flush method.

 
     @library{wxbase}
     @category{logging}
 
     @library{wxbase}
     @category{logging}


@@ -281,6 +507,11 @@ public:
 class wxLogBuffer : public wxLog
 {
 public:
 class wxLogBuffer : public wxLog
 {
 public:

+    /**
+        The default ctor does nothing.
+    */
+    wxLogBuffer();
+

     /**
         Shows all the messages collected so far to the user (using a message box in the
         GUI applications or by printing them out to the console in text mode) and
     /**
         Shows all the messages collected so far to the user (using a message box in the
         GUI applications or by printing them out to the console in text mode) and


@@ -291,29 +522,26 @@ public:
     /**
         Returns the current buffer contains. Messages from different log function calls
         are separated with the new lines in the buffer.
     /**
         Returns the current buffer contains. Messages from different log function calls
         are separated with the new lines in the buffer.

-        The buffer can be cleared by Flush() which will
-        also show the current contents to the user.
+        The buffer can be cleared by Flush() which will also show the current
+        contents to the user.

     */
     */

-    const wxString GetBuffer();
+    const wxString& GetBuffer() const;

 };
 
 
 
 /**
     @class wxLogInterposer
 };
 
 
 
 /**
     @class wxLogInterposer

-    @wxheader{log.h}

 
 

-    A special version of wxLogChain which uses itself as the
-    new log target. It forwards log messages to the previously installed one in
-    addition to
+    A special version of wxLogChain which uses itself as the new log target.
+    It forwards log messages to the previously installed one in addition to

     processing them itself.
 
     processing them itself.
 

-    Unlike wxLogChain which is usually used directly as is,
-    this class must be derived from to implement wxLog::DoLog
-    and/or wxLog::DoLogString methods.
+    Unlike wxLogChain which is usually used directly as is, this class must be
+    derived from to implement wxLog::DoLog and/or wxLog::DoLogString methods.

 
 

-    wxLogInterposer destroys the previous log target in its destructor. If you
-    don't want this to happen, use wxLogInterposerTemp instead.
+    wxLogInterposer destroys the previous log target in its destructor.
+    If you don't want this to happen, use wxLogInterposerTemp instead.

 
     @library{wxbase}
     @category{logging}
 
     @library{wxbase}
     @category{logging}


@@ -324,13 +552,13 @@ public:
     /**
         The default constructor installs this object as the current active log target.
     */
     /**
         The default constructor installs this object as the current active log target.
     */

+    wxLogInterposer();

 };
 
 
 
 /**
     @class wxLogTextCtrl
 };
 
 
 
 /**
     @class wxLogTextCtrl

-    @wxheader{log.h}

 
     Using these target all the log messages can be redirected to a text control.
     The text control must have been created with @c wxTE_MULTILINE style by the
 
     Using these target all the log messages can be redirected to a text control.
     The text control must have been created with @c wxTE_MULTILINE style by the


@@ -348,14 +576,13 @@ public:
         Constructs a log target which sends all the log messages to the given text
         control. The @a textctrl parameter cannot be @NULL.
     */
         Constructs a log target which sends all the log messages to the given text
         control. The @a textctrl parameter cannot be @NULL.
     */

-    wxLogTextCtrl(wxTextCtrl textctrl);
+    wxLogTextCtrl(wxTextCtrl* pTextCtrl);

 };
 
 
 
 /**
     @class wxLog
 };
 
 
 
 /**
     @class wxLog

-    @wxheader{log.h}

 
     wxLog class defines the interface for the @e log targets used by wxWidgets
     logging functions as explained in the @ref overview_log.
 
     wxLog class defines the interface for the @e log targets used by wxWidgets
     logging functions as explained in the @ref overview_log.


@@ -369,116 +596,124 @@ public:
     Otherwise, it is completely hidden behind the @e wxLogXXX() functions and
     you may not even know about its existence.
 
     Otherwise, it is completely hidden behind the @e wxLogXXX() functions and
     you may not even know about its existence.
 

-     @section overview_wxLog_deriving Deriving your own log target
-     
-        There are two functions which must be implemented by any derived class to
-        actually process the log messages: DoLog() and
-        DoLogString(). The second function receives a string
-        which just has to be output in some way and the easiest way to write a new log
-        target is to override just this function in the derived class. If more control
-        over the output format is needed, then the first function must be overridden
-        which allows to construct custom messages depending on the log level or even
-        do completely different things depending on the message severity (for example,
-        throw away all messages except warnings and errors, show warnings on the
-        screen and forward the error messages to the user's (or programmer's) cell
-        phone - maybe depending on whether the timestamp tells us if it is day or
-        night in the current time zone).
-        There also functions to support message buffering. Why are they needed?
-        Some of wxLog implementations, most notably the standard wxLogGui class,
-        buffer the messages (for example, to avoid showing the user a zillion of modal
-        message boxes one after another -- which would be really annoying).
-        Flush() shows them all and clears the buffer contents.
-        This function doesn't do anything if the buffer is already empty.
-        See also:
-        @li Flush()
-        @li FlushActive()
-
-     @section overview_wxLog_Trace_Masks Using trace masks
-
-        The functions below allow some limited customization of wxLog behaviour
-        without writing a new log target class (which, aside from being a matter of
-        several minutes, allows you to do anything you want).
-        The verbose messages are the trace messages which are not disabled in the
-        release mode and are generated by wxLogVerbose(). They
-        are not normally shown to the user because they present little interest, but
-        may be activated, for example, in order to help the user find some program
-        problem.
-        As for the (real) trace messages, their handling depends on the settings of
-        the (application global) @e trace mask which can either be specified using
-        SetTraceMask(), GetTraceMask() and wxLogTrace() which takes an integer mask
-        or using AddTraceMask() for string trace masks.
-        The difference between bit-wise and string trace masks is that a message using
-        integer trace mask will only be logged if all bits of the mask are set in the
-        current mask while a message using string mask will be logged simply if the
-        mask had been added before to the list of allowed ones.
-        For example,
-        
-        @code
-        wxLogTrace( wxTraceRefCount|wxTraceOleCalls, "Active object ref count: %d", nRef );
-        @endcode
+    @note For console-mode applications, the default target is wxLogStderr, so
+          that all @e wxLogXXX() functions print on @c stderr when @c wxUSE_GUI = 0.

 
 

-        will do something only if the current trace mask contains both
-        @c wxTraceRefCount and @c wxTraceOle, but

 
 

-        @code
-        wxLogTrace( wxTRACE_OleCalls, "IFoo::Bar() called" );
-        @endcode
-        
-        will log the message if it was preceded by
-        
-        @code
-        wxLog::AddTraceMask( wxTRACE_OleCalls);
-        @endcode
+    @section log_derivingyours Deriving your own log target
+
+    There are several methods which may be overridden in the derived class to
+    customize log messages handling: DoLogRecord(), DoLogTextAtLevel() and
+    DoLogText().
+
+    The last method is the simplest one: you should override it if you simply
+    want to redirect the log output elsewhere, without taking into account the
+    level of the message. If you do want to handle messages of different levels
+    differently, then you should override DoLogTextAtLevel().
+
+    Finally, if more control over the output format is needed, then the first
+    function must be overridden as it allows to construct custom messages
+    depending on the log level or even do completely different things depending
+    on the message severity (for example, throw away all messages except
+    warnings and errors, show warnings on the screen and forward the error
+    messages to the user's (or programmer's) cell phone -- maybe depending on
+    whether the timestamp tells us if it is day or night in the current time
+    zone).
+
+    There also functions to support message buffering. Why are they needed?
+    Some of wxLog implementations, most notably the standard wxLogGui class,
+    buffer the messages (for example, to avoid showing the user a zillion of modal
+    message boxes one after another -- which would be really annoying).
+
+    Flush() shows them all and clears the buffer contents.
+    This function doesn't do anything if the buffer is already empty.
+
+    @see FlushActive()
+
+
+    @section log_tracemasks Using trace masks
+
+    Notice that the use of log trace masks is hardly necessary any longer in
+    current wxWidgets version as the same effect can be achieved by using
+    different log components for different log statements of any level. Please
+    see @ref overview_log_enable for more information about the log components.
+
+    The functions below allow some limited customization of wxLog behaviour
+    without writing a new log target class (which, aside from being a matter of
+    several minutes, allows you to do anything you want).
+    The verbose messages are the trace messages which are not disabled in the
+    release mode and are generated by wxLogVerbose().
+    They are not normally shown to the user because they present little interest,
+    but may be activated, for example, in order to help the user find some program
+    problem.
+
+    As for the (real) trace messages, their handling depends on the currently
+    enabled trace masks: if AddTraceMask() was called for the mask of the given
+    message, it will be logged, otherwise nothing happens.
+
+    For example,
+    @code
+    wxLogTrace( wxTRACE_OleCalls, "IFoo::Bar() called" );
+    @endcode
+
+    will log the message if it was preceded by:
+
+    @code
+    wxLog::AddTraceMask( wxTRACE_OleCalls);
+    @endcode
+
+    The standard trace masks are given in wxLogTrace() documentation.
+
+    Finally, the @e wxLog::DoLog() function automatically prepends a time stamp
+    to all the messages. The format of the time stamp may be changed: it can be
+    any string with % specifications fully described in the documentation of the
+    standard @e strftime() function. For example, the default format is
+    "[%d/%b/%y %H:%M:%S] " which gives something like "[17/Sep/98 22:10:16] "
+    (without quotes) for the current date. Setting an empty string as the time
+    format or calling the shortcut wxLog::DisableTimestamp(), disables timestamping
+    of the messages completely.
+
+    See also
+    @li AddTraceMask()
+    @li RemoveTraceMask()
+    @li ClearTraceMasks()
+    @li GetTraceMasks()
+    @li IsAllowedTraceMask()
+    @li SetVerbose()
+    @li GetVerbose()
+    @li SetTimestamp()
+    @li GetTimestamp()
+    @li SetTraceMask()
+    @li GetTraceMask()
+    @li SetRepetitionCounting()
+    @li GetRepetitionCounting()
+
+    @note
+    Timestamping is disabled for Visual C++ users in debug builds by
+    default because otherwise it would be impossible to directly go to the line
+    from which the log message was generated by simply clicking in the debugger
+    window on the corresponding error message. If you wish to enable it, please
+    use SetTimestamp() explicitly.
+
+
+    @section log_target Manipulating the log target
+
+    The functions in this section work with and manipulate the active log
+    target.
+
+    Get/Set methods are used to install/query the current active target and,
+    finally, DontCreateOnDemand() disables the automatic creation of a standard
+    log target if none actually exists. It is only useful when the application
+    is terminating and shouldn't be used in other situations because it may
+    easily lead to a loss of messages.
+
+    See also:
+    @li GetActiveTarget()
+    @li SetActiveTarget()
+    @li DontCreateOnDemand()
+    @li Suspend()
+    @li Resume()

 
 

-        Using string masks is simpler and allows you to easily add custom ones, so this is
-        the preferred way of working with trace messages. The integer trace mask is
-        kept for compatibility and for additional (but very rarely needed) flexibility
-        only.
-        The standard trace masks are given in wxLogTrace() documentation.
-        Finally, the @e wxLog::DoLog() function automatically prepends a time stamp
-        to all the messages. The format of the time stamp may be changed: it can be
-        any string with % specifications fully described in the documentation of the
-        standard @e strftime() function. For example, the default format is
-        "[%d/%b/%y %H:%M:%S] " which gives something like "[17/Sep/98 22:10:16] "
-        (without quotes) for the current date. Setting an empty string as the time
-        format disables timestamping of the messages completely.
-        See also
-        @li AddTraceMask()
-        @li RemoveTraceMask()
-        @li ClearTraceMasks()
-        @li GetTraceMasks()
-        @li IsAllowedTraceMask()
-        @li SetVerbose()
-        @li GetVerbose()
-        @li SetTimestamp()
-        @li GetTimestamp()
-        @li SetTraceMask()
-        @li GetTraceMask()
-        @li SetRepetitionCounting()
-        @li GetRepetitionCounting()
-
-        @note Timestamping is disabled for Visual C++ users in debug builds by
-        default because otherwise it would be impossible to directly go to the line
-        from which the log message was generated by simply clicking in the debugger
-        window on the corresponding error message. If you wish to enable it, please
-        use SetTimestamp() explicitly. 
-        
-     @section overview_wxLog_Target Manipulating the log target
-
-        The functions in this section work with and manipulate the active log
-        target. The OnLog() is called by the @e wxLogXXX() functions
-        and invokes the DoLog() of the active log target if any.
-        Get/Set methods are used to install/query the current active target and,
-        finally, DontCreateOnDemand() disables the automatic creation of a standard
-        log target if none actually exists. It is only useful when the application
-        is terminating and shouldn't be used in other situations because it may
-        easily lead to a loss of messages. See also
-        @li OnLog()
-        @li GetActiveTarget()
-        @li SetActiveTarget()
-        @li DontCreateOnDemand()
-        @li Suspend()
-        @li Resume()

 
     @library{wxcore}
     @category{logging}
 
     @library{wxcore}
     @category{logging}


@@ -489,78 +724,87 @@ class wxLog
 {
 public:
     /**
 {
 public:
     /**

-        Add the @a mask to the list of allowed masks for
-        wxLogTrace().
+        Add the @a mask to the list of allowed masks for wxLogTrace().

 
         @see RemoveTraceMask(), GetTraceMasks()
     */
     static void AddTraceMask(const wxString& mask);
 
     /**
 
         @see RemoveTraceMask(), GetTraceMasks()
     */
     static void AddTraceMask(const wxString& mask);
 
     /**

-        Removes all trace masks previously set with
-        AddTraceMask().
+        Removes all trace masks previously set with AddTraceMask().

 
         @see RemoveTraceMask()
     */
     static void ClearTraceMasks();
 
 
         @see RemoveTraceMask()
     */
     static void ClearTraceMasks();
 

-    */
-
-
-    /**
-        Disables time stamping of the log messages.
-        This function is new since wxWidgets version 2.9
-    */
-    void SetTimestamp(const wxString& format);
-
-    /**
-        Called to process the message of the specified severity. @a msg is the text
-        of the message as specified in the call of @e wxLogXXX() function which
-        generated it and @a timestamp is the moment when the message was generated.
-        The base class version prepends the timestamp to the message, adds a prefix
-        corresponding to the log level and then calls
-        DoLogString() with the resulting string.
-    */
-    virtual void DoLog(wxLogLevel level, const wxString& msg,
-                       time_t timestamp);
-
-    /**
-        Called to log the specified string. The timestamp is already included in the
-        string but still passed to this function.
-        A simple implementation may just send the string to @c stdout or, better,
-        @c stderr.
-    */
-    virtual void DoLogString(const wxString& msg, time_t timestamp);
-

     /**
         Instructs wxLog to not create new log targets on the fly if there is none
         currently. (Almost) for internal use only: it is supposed to be called by the
         application shutdown code.
     /**
         Instructs wxLog to not create new log targets on the fly if there is none
         currently. (Almost) for internal use only: it is supposed to be called by the
         application shutdown code.

-        Note that this function also calls
-        ClearTraceMasks().
+
+        Note that this function also calls ClearTraceMasks().

     */
     static void DontCreateOnDemand();
 
     /**
     */
     static void DontCreateOnDemand();
 
     /**

-        Shows all the messages currently in buffer and clears it. If the buffer
-        is already empty, nothing happens.
+        Globally enable or disable logging.
+
+        Calling this function with @false argument disables all log messages
+        for the current thread.
+
+        @see wxLogNull, IsEnabled()
+
+        @return
+            The old state, i.e. @true if logging was previously enabled and
+            @false if it was disabled.
+     */
+    static bool EnableLogging(bool enable = true);
+
+    /**
+        Shows all the messages currently in buffer and clears it.
+
+        If the buffer is already empty, nothing happens.
+
+        If you override this method in a derived class, call the base class
+        version first, before doing anything else.

     */
     virtual void Flush();
 
     /**
         Flushes the current log target if any, does nothing if there is none.
 
     */
     virtual void Flush();
 
     /**
         Flushes the current log target if any, does nothing if there is none.
 

-        @see Flush()
+        When this method is called from the main thread context, it also
+        flushes any previously buffered messages logged by the other threads.
+        When it is called from the other threads it simply calls Flush() on the
+        currently active log target, so it mostly makes sense to do this if a
+        thread has its own logger set with SetThreadActiveTarget().

     */
     static void FlushActive();
 
     /**
         Returns the pointer to the active log target (may be @NULL).
     */
     static void FlushActive();
 
     /**
         Returns the pointer to the active log target (may be @NULL).

+
+        Notice that if SetActiveTarget() hadn't been previously explicitly
+        called, this function will by default try to create a log target by
+        calling wxAppTraits::CreateLogTarget() which may be overridden in a
+        user-defined traits class to change the default behaviour. You may also
+        call DontCreateOnDemand() to disable this behaviour.
+
+        When this function is called from threads other than main one,
+        auto-creation doesn't happen. But if the thread has a thread-specific
+        log target previously set by SetThreadActiveTarget(), it is returned
+        instead of the global one. Otherwise, the global log target is
+        returned.

     */
     static wxLog* GetActiveTarget();
 
     /**
         Returns the current log level limit.
     */
     static wxLog* GetActiveTarget();
 
     /**
         Returns the current log level limit.

+
+        All messages at levels strictly greater than the value returned by this
+        function are not logged at all.
+
+        @see SetLogLevel(), IsLevelEnabled()

     */
     static wxLogLevel GetLogLevel();
 
     */
     static wxLogLevel GetLogLevel();
 


@@ -572,11 +816,11 @@ public:
     /**
         Returns the current timestamp format string.
     */
     /**
         Returns the current timestamp format string.
     */

-    static const wxString GetTimestamp();
+    static const wxString& GetTimestamp();

 
     /**
 
     /**

-        Returns the current trace mask, see Customization() section
-        for details.
+        @deprecated
+        Returns the current trace mask, see Customization() section for details.

     */
     static wxTraceMask GetTraceMask();
 
     */
     static wxTraceMask GetTraceMask();
 


@@ -585,7 +829,7 @@ public:
 
         @see AddTraceMask().
     */
 
         @see AddTraceMask().
     */

-    static const wxArrayString GetTraceMasks();
+    static const wxArrayString& GetTraceMasks();

 
     /**
         Returns whether the verbose mode is currently active.
 
     /**
         Returns whether the verbose mode is currently active.


@@ -593,69 +837,85 @@ public:
     static bool GetVerbose();
 
     /**
     static bool GetVerbose();
 
     /**

-        Returns @true if the @a mask is one of allowed masks for
-        wxLogTrace().
-        
+        Returns @true if the @a mask is one of allowed masks for wxLogTrace().
+

         See also: AddTraceMask(), RemoveTraceMask()
     */
     static bool IsAllowedTraceMask(const wxString& mask);
 
     /**
         See also: AddTraceMask(), RemoveTraceMask()
     */
     static bool IsAllowedTraceMask(const wxString& mask);
 
     /**

-        There are two functions which must be implemented by any derived class to
-        actually process the log messages: DoLog() and
-        DoLogString(). The second function receives a string
-        which just has to be output in some way and the easiest way to write a new log
-        target is to override just this function in the derived class. If more control
-        over the output format is needed, then the first function must be overridden
-        which allows you to construct custom messages depending on the log level or even
-        do completely different things depending on the message severity (for example,
-        throw away all messages except warnings and errors, show warnings on the
-        screen and forward the error messages to the user's (or programmer's) cell
-        phone - maybe depending on whether the timestamp tells us if it is day or
-        night in the current time zone).
-        There also functions to support message buffering. Why are they needed?
-        Some of wxLog implementations, most notably the standard wxLogGui class,
-        buffer the messages (for example, to avoid showing the user a zillion of modal
-        message boxes one after another -- which would be really annoying).
-        Flush() shows them all and clears the buffer contents.
-        This function doesn't do anything if the buffer is already empty.
-        Flush()
-
-        FlushActive()
-    */
+        Returns true if logging is enabled at all now.

 
 

+        @see IsLevelEnabled(), EnableLogging()
+     */
+    static bool IsEnabled();

 
     /**
 
     /**

-        Forwards the message at specified level to the @e DoLog() function of the
-        active log target if there is any, does nothing otherwise.
-    */
-    static void OnLog(wxLogLevel level, const wxString& message);
+        Returns true if logging at this level is enabled for the current thread.
+
+        This function only returns @true if logging is globally enabled and if
+        @a level is less than or equal to the maximal log level enabled for the
+        given @a component.
+
+        @see IsEnabled(), SetLogLevel(), GetLogLevel(), SetComponentLevel()
+
+        @since 2.9.1
+     */
+    static bool IsLevelEnabled(wxLogLevel level, wxString component);

 
     /**
         Remove the @a mask from the list of allowed masks for
         wxLogTrace().
 
     /**
         Remove the @a mask from the list of allowed masks for
         wxLogTrace().

-        See also: AddTraceMask()
+
+        @see AddTraceMask()

     */
     static void RemoveTraceMask(const wxString& mask);
 
     /**
     */
     static void RemoveTraceMask(const wxString& mask);
 
     /**

-        Resumes logging previously suspended by a call to
-        Suspend(). All messages logged in the meanwhile will be
-        flushed soon.
+        Resumes logging previously suspended by a call to Suspend().
+        All messages logged in the meanwhile will be flushed soon.

     */
     static void Resume();
 
     /**
     */
     static void Resume();
 
     /**

-        Sets the specified log target as the active one. Returns the pointer to the
-        previous active log target (may be @NULL).  To suppress logging use a new
-        instance of wxLogNull not @NULL.  If the active log target is set to @NULL a
-        new default log target will be created when logging occurs.
+        Sets the specified log target as the active one.
+
+        Returns the pointer to the previous active log target (may be @NULL).
+        To suppress logging use a new instance of wxLogNull not @NULL.  If the
+        active log target is set to @NULL a new default log target will be
+        created when logging occurs.
+
+        @see SetThreadActiveTarget()

     */
     static wxLog* SetActiveTarget(wxLog* logtarget);
 
     /**
     */
     static wxLog* SetActiveTarget(wxLog* logtarget);
 
     /**

-        Specifies that log messages with level  logLevel should be ignored
-        and not sent to the active log target.
+        Sets the log level for the given component.
+
+        For example, to disable all but error messages from wxWidgets network
+        classes you may use
+        @code
+            wxLog::SetComponentLevel("wx/net", wxLOG_Error);
+        @endcode
+
+        SetLogLevel() may be used to set the global log level.
+
+        @param component
+            Non-empty component name, possibly using slashes (@c /) to separate
+            it into several parts.
+        @param level
+            Maximal level of log messages from this component which will be
+            handled instead of being simply discarded.
+
+        @since 2.9.1
+     */
+    static void SetComponentLevel(const wxString& component, wxLogLevel level);
+
+    /**
+        Specifies that log messages with level greater (numerically) than
+        @a logLevel should be ignored and not sent to the active log target.
+
+        @see SetComponentLevel()

     */
     static void SetLogLevel(wxLogLevel logLevel);
 
     */
     static void SetLogLevel(wxLogLevel logLevel);
 


@@ -666,6 +926,32 @@ public:
     */
     static void SetRepetitionCounting(bool repetCounting = true);
 
     */
     static void SetRepetitionCounting(bool repetCounting = true);
 

+    /**
+        Sets a thread-specific log target.
+
+        The log target passed to this function will be used for all messages
+        logged by the current thread using the usual wxLog functions. This
+        shouldn't be called from the main thread which never uses a thread-
+        specific log target but can be used for the other threads to handle
+        thread logging completely separately; instead of buffering thread log
+        messages in the main thread logger.
+
+        Notice that unlike for SetActiveTarget(), wxWidgets does not destroy
+        the thread-specific log targets when the thread terminates so doing
+        this is your responsibility.
+
+        This method is only available if @c wxUSE_THREADS is 1, i.e. wxWidgets
+        was compiled with threads support.
+
+        @param logger
+            The new thread-specific log target, possibly @NULL.
+        @return
+            The previous thread-specific log target, initially @NULL.
+
+        @since 2.9.1
+     */
+    static wxLog *SetThreadActiveTarget(wxLog *logger);
+

     /**
         Sets the timestamp format prepended by the default log targets to all
         messages. The string may contain any normal characters as well as %
     /**
         Sets the timestamp format prepended by the default log targets to all
         messages. The string may contain any normal characters as well as %


@@ -675,8 +961,15 @@ public:
     static void SetTimestamp(const wxString& format);
 
     /**
     static void SetTimestamp(const wxString& format);
 
     /**

-        Sets the trace mask, see Customization()
-        section for details.
+        Disables time stamping of the log messages.
+
+        @since 2.9.0
+    */
+    static void DisableTimestamp();
+
+    /**
+        @deprecated
+        Sets the trace mask, see @ref log_tracemasks section for details.

     */
     static void SetTraceMask(wxTraceMask mask);
 
     */
     static void SetTraceMask(wxTraceMask mask);
 


@@ -687,25 +980,110 @@ public:
     static void SetVerbose(bool verbose = true);
 
     /**
     static void SetVerbose(bool verbose = true);
 
     /**

-        Suspends the logging until Resume() is called. Note that
-        the latter must be called the same number of times as the former to undo it,
-        i.e. if you call Suspend() twice you must call Resume() twice as well.
+        Suspends the logging until Resume() is called.
+
+        Note that the latter must be called the same number of times as the former
+        to undo it, i.e. if you call Suspend() twice you must call Resume() twice as well.
+

         Note that suspending the logging means that the log sink won't be be flushed
         periodically, it doesn't have any effect if the current log target does the
         Note that suspending the logging means that the log sink won't be be flushed
         periodically, it doesn't have any effect if the current log target does the

-        logging immediately without waiting for Flush() to be
-        called (the standard GUI log target only shows the log dialog when it is
-        flushed, so Suspend() works as expected with it).
+        logging immediately without waiting for Flush() to be called (the standard
+        GUI log target only shows the log dialog when it is flushed, so Suspend()
+        works as expected with it).

 
         @see Resume(), wxLogNull
     */
     static void Suspend();
 
         @see Resume(), wxLogNull
     */
     static void Suspend();

+
+    /**
+        Log the given record.
+
+        This function should only be called from the DoLog() implementations in
+        the derived classes if they need to call DoLogRecord() on another log
+        object (they can, of course, just use wxLog::DoLogRecord() call syntax
+        to call it on the object itself). It should not be used for logging new
+        messages which can be only sent to the currently active logger using
+        OnLog() which also checks if the logging (for this level) is enabled
+        while this method just directly calls DoLog().
+
+        Example of use of this class from wxLogChain:
+        @code
+        void wxLogChain::DoLogRecord(wxLogLevel level,
+                                     const wxString& msg,
+                                     const wxLogRecordInfo& info)
+        {
+            // let the previous logger show it
+            if ( m_logOld && IsPassingMessages() )
+                m_logOld->LogRecord(level, msg, info);
+
+            // and also send it to the new one
+            if ( m_logNew && m_logNew != this )
+                m_logNew->LogRecord(level, msg, info);
+        }
+        @endcode
+
+        @since 2.9.1
+     */
+    void LogRecord(wxLogLevel level, const wxString& msg, time_t timestamp);
+
+protected:
+    /**
+        @name Logging callbacks.
+
+        The functions which should be overridden by custom log targets.
+
+        When defining a new log target, you have a choice between overriding
+        DoLogRecord(), which provides maximal flexibility, DoLogTextAtLevel()
+        which can be used if you don't intend to change the default log
+        messages formatting but want to handle log messages of different levels
+        differently or, in the simplest case, DoLogText().
+     */
+    //@{
+
+    /**
+        Called to created log a new record.
+
+        Any log message created by wxLogXXX() functions is passed to this
+        method of the active log target. The default implementation prepends
+        the timestamp and, for some log levels (e.g. error and warning), the
+        corresponding prefix to @a msg and passes it to DoLogTextAtLevel().
+
+        You may override this method to implement custom formatting of the
+        log messages or to implement custom filtering of log messages (e.g. you
+        could discard all log messages coming from the given source file).
+     */
+    virtual void DoLogRecord(wxLogLevel level,
+                             const wxString& msg,
+                             const wxLogRecordInfo& info);
+
+    /**
+        Called to log the specified string at given level.
+
+        The base class versions logs debug and trace messages on the system
+        default debug output channel and passes all the other messages to
+        DoLogText().
+    */
+    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg);
+
+    /**
+        Called to log the specified string.
+
+        A simple implementation might just send the string to @c stdout or
+        @c stderr or save it in a file (of course, the already existing
+        wxLogStderr can be used for this).
+
+        The base class version of this function asserts so it must be
+        overridden if you don't override DoLogRecord() or DoLogTextAtLevel().
+    */
+    virtual void DoLogText(const wxString& msg);
+
+    //@}

 };
 
 
 
 /**
     @class wxLogNull
 };
 
 
 
 /**
     @class wxLogNull

-    @wxheader{log.h}

 
     This class allows you to temporarily suspend logging. All calls to the log
     functions during the life time of an object of this class are just ignored.
 
     This class allows you to temporarily suspend logging. All calls to the log
     functions during the life time of an object of this class are just ignored.


@@ -718,7 +1096,7 @@ public:
     For instance, the example of the overview:
 
     @code
     For instance, the example of the overview:
 
     @code

-    wxFile file;
+      wxFile file;

 
       // wxFile.Open() normally complains if file can't be opened, we don't want it
       {
 
       // wxFile.Open() normally complains if file can't be opened, we don't want it
       {


@@ -733,7 +1111,7 @@ public:
     would be better written as:
 
     @code
     would be better written as:
 
     @code

-    wxFile file;
+      wxFile file;

 
       // don't try to open file if it doesn't exist, we are prepared to deal with
       // this ourselves - but all other errors are not expected
 
       // don't try to open file if it doesn't exist, we are prepared to deal with
       // this ourselves - but all other errors are not expected


@@ -752,7 +1130,7 @@ public:
     @library{wxbase}
     @category{logging}
 */
     @library{wxbase}
     @category{logging}
 */

-class wxLogNull : public wxLog
+class wxLogNull

 {
 public:
     /**
 {
 public:
     /**


@@ -763,6 +1141,7 @@ public:
     /**
         Resumes logging.
     */
     /**
         Resumes logging.
     */

+    ~wxLogNull();

 };
 
 
 };
 
 


@@ -771,7 +1150,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 
 /**
 //@{
 
 /**


@@ -817,7 +1196,7 @@ const wxChar* wxSysErrorMsg(unsigned long errCode = 0);
 
 //@}
 
 
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     For all normal, informational messages. They also appear in a message box
 //@{
 /**
     For all normal, informational messages. They also appear in a message box


@@ -829,7 +1208,7 @@ void wxLogMessage(const char* formatString, ... );
 void wxVLogMessage(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogMessage(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     For verbose output. Normally, it is suppressed, but might be activated if
 //@{
 /**
     For verbose output. Normally, it is suppressed, but might be activated if


@@ -842,7 +1221,7 @@ void wxLogVerbose(const char* formatString, ... );
 void wxVLogVerbose(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogVerbose(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     For warnings - they are also normally shown to the user, but don't
 //@{
 /**
     For warnings - they are also normally shown to the user, but don't


@@ -854,7 +1233,7 @@ void wxLogWarning(const char* formatString, ... );
 void wxVLogWarning(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogWarning(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     Like wxLogError(), but also terminates the program with the exit code 3.
 //@{
 /**
     Like wxLogError(), but also terminates the program with the exit code 3.


@@ -867,7 +1246,7 @@ void wxLogFatalError(const char* formatString, ... );
 void wxVLogFatalError(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogFatalError(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     The functions to use for error messages, i.e. the messages that must be
 //@{
 /**
     The functions to use for error messages, i.e. the messages that must be


@@ -880,26 +1259,33 @@ void wxLogError(const char* formatString, ... );
 void wxVLogError(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogError(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
 //@{
 /**

+    Log a message at wxLOG_Trace log level.
+
+    Notice that the use of trace masks is not recommended any more as setting
+    the log components (please see @ref overview_log_enable) provides a way to
+    do the same thing for log messages of any level, and not just the tracing
+    ones.
+

     Like wxLogDebug(), trace functions only do something in debug builds and
     expand to nothing in the release one. The reason for making it a separate
     function is that usually there are a lot of trace messages, so it might
     make sense to separate them from other debug messages.
 
     Like wxLogDebug(), trace functions only do something in debug builds and
     expand to nothing in the release one. The reason for making it a separate
     function is that usually there are a lot of trace messages, so it might
     make sense to separate them from other debug messages.
 

-    wxLogDebug(const char*,const char*,...) and
-    wxLogDebug(wxTraceMask,const char*,...) can be used instead if you would
-    like to be able to separate trace messages into different categories which
-    can be enabled or disabled with the static functions provided in wxLog.
+    wxLogTrace(const char*,const char*,...) and can be used instead of
+    wxLogDebug() if you would like to be able to separate trace messages into
+    different categories which can be enabled or disabled with
+    wxLog::AddTraceMask() and wxLog::RemoveTraceMask().

 
     @header{wx/log.h}
 */
 
     @header{wx/log.h}
 */

-void wxLogTrace(const char* formatString, ... );
-void wxVLogTrace(const char* formatString, va_list argPtr);
+void wxLogTrace(const char *mask, const char* formatString, ... );
+void wxVLogTrace(const char *mask, const char* formatString, va_list argPtr);

 //@}
 
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     Like wxLogDebug(), trace functions only do something in debug builds and
 //@{
 /**
     Like wxLogDebug(), trace functions only do something in debug builds and


@@ -942,7 +1328,7 @@ void wxVLogTrace(const char* mask,
                   va_list argPtr);
 //@}
 
                   va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     Like wxLogDebug(), trace functions only do something in debug builds and
 //@{
 /**
     Like wxLogDebug(), trace functions only do something in debug builds and


@@ -950,10 +1336,11 @@ void wxVLogTrace(const char* mask,
     function is that usually there are a lot of trace messages, so it might
     make sense to separate them from other debug messages.
 
     function is that usually there are a lot of trace messages, so it might
     make sense to separate them from other debug messages.
 

+    @deprecated

     This version of wxLogTrace() only logs the message if all the bits
     corresponding to the @a mask are set in the wxLog trace mask which can be
     set by calling wxLog::SetTraceMask(). This version is less flexible than
     This version of wxLogTrace() only logs the message if all the bits
     corresponding to the @a mask are set in the wxLog trace mask which can be
     set by calling wxLog::SetTraceMask(). This version is less flexible than

-    wxLogDebug(const char*,const char*,...) because it doesn't allow defining
+    wxLogTrace(const char*,const char*,...) because it doesn't allow defining

     the user trace masks easily. This is why it is deprecated in favour of
     using string trace masks.
 
     the user trace masks easily. This is why it is deprecated in favour of
     using string trace masks.
 


@@ -973,7 +1360,7 @@ void wxLogTrace(wxTraceMask mask, const char* formatString, ... );
 void wxVLogTrace(wxTraceMask mask, const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogTrace(wxTraceMask mask, const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     The right functions for debug output. They only do something in debug mode
 //@{
 /**
     The right functions for debug output. They only do something in debug mode


@@ -986,7 +1373,7 @@ void wxLogDebug(const char* formatString, ... );
 void wxVLogDebug(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogDebug(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     Messages logged by this function will appear in the statusbar of the
 //@{
 /**
     Messages logged by this function will appear in the statusbar of the


@@ -1003,7 +1390,7 @@ void wxLogStatus(const char* formatString, ... );
 void wxVLogStatus(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogStatus(const char* formatString, va_list argPtr);
 //@}
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 /**
     Mostly used by wxWidgets itself, but might be handy for logging errors
 //@{
 /**
     Mostly used by wxWidgets itself, but might be handy for logging errors


@@ -1021,3 +1408,24 @@ void wxLogSysError(const char* formatString, ... );
 void wxVLogSysError(const char* formatString, va_list argPtr);
 //@}
 
 void wxVLogSysError(const char* formatString, va_list argPtr);
 //@}
 

+/** @addtogroup group_funcmacro_debug */
+//@{
+
+/**
+    @def wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD()
+
+    Use this macro to disable logging at debug and trace levels in release
+    build when not using IMPLEMENT_APP().
+
+    @see wxDISABLE_DEBUG_SUPPORT(),
+         wxDISABLE_ASSERTS_IN_RELEASE_BUILD(),
+         @ref overview_debugging
+
+    @since 2.9.1
+
+    @header{wx/log.h}
+ */
+#define wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD()
+
+//@}
+