X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b895ab50e2804f1d281799254d7840d57592bdef..313509870731313f5091a973c3710110761904d4:/include/wx/generic/logg.h

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 627de94207..b7409d4610 100644
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -34,9 +34,7 @@ public:
 
 protected:
     // implement sink function
-    virtual void DoLogString(const wxString& szString, time_t t);
-
-    wxSUPPRESS_DOLOGSTRING_HIDE_WARNING()
+    virtual void DoLogText(const wxString& msg);
 
 private:
     // the control we use
@@ -63,9 +61,9 @@ public:
     virtual void Flush();
 
 protected:
-    virtual void DoLog(wxLogLevel level, const wxString& szString, time_t t);
-
-    wxSUPPRESS_DOLOG_HIDE_WARNING()
+    virtual void DoLogRecord(wxLogLevel level,
+                             const wxString& msg,
+                             const wxLogRecordInfo& info);
 
     // return the title to be used for the log dialog, depending on m_bErrors
     // and m_bWarnings values
@@ -106,7 +104,7 @@ private:
 // ----------------------------------------------------------------------------
 // (background) log window: this class forwards all log messages to the log
 // target which was active when it was instantiated, but also collects them
-// to the log window. This window has it's own menu which allows the user to
+// to the log window. This window has its own menu which allows the user to
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------
 
@@ -129,9 +127,6 @@ public:
     wxFrame *GetFrame() const;
 
     // overridables
-        // called immediately after the log frame creation allowing for
-        // any extra initializations
-    virtual void OnFrameCreate(wxFrame *frame);
         // 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
@@ -142,11 +137,7 @@ public:
     virtual void OnFrameDelete(wxFrame *frame);
 
 protected:
-    virtual void DoLog(wxLogLevel level, const wxString& szString, time_t t);
-    virtual void DoLogString(const wxString& szString, time_t t);
-
-    wxSUPPRESS_DOLOG_HIDE_WARNING()
-    wxSUPPRESS_DOLOGSTRING_HIDE_WARNING()
+    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg);
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame