added a test to check if wxHtmlWindow::SelectionToText() inserts \n characters correctly

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

diff --git a/interface/wx/log.h b/interface/wx/log.h
index df0ffcea372275dda2f235dc53e28e8247bb4b74..05080f01351137c2256aedc6b690f16f564446e5 100644 (file)
--- a/interface/wx/log.h
+++ b/interface/wx/log.h
@@ -144,7 +144,7 @@ public:
     /**
         Destroys the previous log target.
     */
-    ~wxLogChain();
+    virtual ~wxLogChain();
 
     /**
         Detaches the old log target so it won't be destroyed when the wxLogChain object
@@ -421,7 +421,7 @@ 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.
     */
-    wxLogStderr(FILE fp = NULL);
+    wxLogStderr(FILE* fp = NULL);
 };
 
 
@@ -510,7 +510,7 @@ public:
         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);
 };
 
 
@@ -531,7 +531,7 @@ public:
     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
@@ -573,7 +573,7 @@ public:
         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
@@ -584,9 +584,9 @@ public:
         @code
         wxLogTrace( wxTRACE_OleCalls, "IFoo::Bar() called" );
         @endcode
-        
+
         will log the message if it was preceded by
-        
+
         @code
         wxLog::AddTraceMask( wxTRACE_OleCalls);
         @endcode
@@ -622,8 +622,8 @@ public:
         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. 
-        
+        use SetTimestamp() explicitly.
+
      @section overview_wxLog_Target Manipulating the log target
 
         The functions in this section work with and manipulate the active log
@@ -669,7 +669,7 @@ public:
         Disables time stamping of the log messages.
         This function is new since wxWidgets version 2.9
     */
-    void SetTimestamp(const wxString& format);
+    static void SetTimestamp(const wxString& format);
 
     /**
         Called to process the message of the specified severity. @a msg is the text
@@ -753,7 +753,7 @@ public:
     /**
         Returns @true if the @a mask is one of allowed masks for
         wxLogTrace().
-        
+
         See also: AddTraceMask(), RemoveTraceMask()
     */
     static bool IsAllowedTraceMask(const wxString& mask);