OnSysRead is pure virtual

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

diff --git a/interface/wx/log.h b/interface/wx/log.h
index d8ffb8d27a9746832768d89d68713c422defa7e3..a1d249c699f93bf6f15b47c08697f32a01ad1b61 100644 (file)
--- a/interface/wx/log.h
+++ b/interface/wx/log.h
@@ -9,7 +9,7 @@
 
 /**
     Different standard log levels (you may also define your own) used with
 
 /**
     Different standard log levels (you may also define your own) used with

-    by standard wxLog functions wxLogError(), wxLogWarning(), etc...
+    by standard wxLog functions wxLogGeneric(), wxLogError(), wxLogWarning(), etc...

 */
 enum wxLogLevelValues
 {
 */
 enum wxLogLevelValues
 {


@@ -747,7 +747,7 @@ public:
         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 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
+        Note that suspending the logging means that the log sink won't 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()
         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()


@@ -869,7 +869,7 @@ public:
     /**
         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 %

-        prefixed format specificators, see @e strftime() manual for details.
+        prefixed format specifiers, see @e strftime() manual for details.

         Passing an empty string to this function disables message time stamping.
     */
     static void SetTimestamp(const wxString& format);
         Passing an empty string to this function disables message time stamping.
     */
     static void SetTimestamp(const wxString& format);


@@ -942,7 +942,7 @@ public:
 
         @since 2.9.1
      */
 
         @since 2.9.1
      */

-    void LogRecord(wxLogLevel level, const wxString& msg, time_t timestamp);
+    void LogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info);

 
 protected:
     /**
 
 protected:
     /**


@@ -959,7 +959,7 @@ protected:
     //@{
 
     /**
     //@{
 
     /**

-        Called to created log a new record.
+        Called to 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
 
         Any log message created by wxLogXXX() functions is passed to this
         method of the active log target. The default implementation prepends


@@ -1114,6 +1114,18 @@ const wxChar* wxSysErrorMsg(unsigned long errCode = 0);
 
 //@}
 
 
 //@}
 

+/** @addtogroup group_funcmacro_log */
+//@{
+/**
+    Logs a message with the given wxLogLevel.
+    E.g. using @c wxLOG_Message as first argument, this function behaves like wxLogMessage().
+
+    @header{wx/log.h}
+*/
+void wxLogGeneric(wxLogLevel level, const char* formatString, ... );
+void wxVLogGeneric(wxLogLevel level, const char* formatString, va_list argPtr);
+//@}
+

 /** @addtogroup group_funcmacro_log */
 //@{
 /**
 /** @addtogroup group_funcmacro_log */
 //@{
 /**


@@ -1281,7 +1293,7 @@ void wxVLogStatus(const char* formatString, va_list argPtr);
 /**
     Mostly used by wxWidgets itself, but might be handy for logging errors
     after system call (API function) failure. It logs the specified message
 /**
     Mostly used by wxWidgets itself, but might be handy for logging errors
     after system call (API function) failure. It logs the specified message

-    text as well as the last system error code (@e errno or @e ::GetLastError()
+    text as well as the last system error code (@e errno or @e GetLastError()

     depending on the platform) and the corresponding error message. The second
     form of this function takes the error code explicitly as the first
     argument.
     depending on the platform) and the corresponding error message. The second
     form of this function takes the error code explicitly as the first
     argument.