Implement GetPageText for the OSX WebKit implementation.

[wxWidgets.git] / include / wx / generic / logg.h

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 83038d08b12a78edbf1be248b41ecd8de83e0eca..4cff569de048cd15b30a642a328fa217b11dd4bb 100644 (file)
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -14,6 +14,10 @@
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxLogFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+

 // ----------------------------------------------------------------------------
 // the following log targets are only compiled in if the we're compiling the
 // GUI part (andnot just the base one) of the library, they're implemented in
 // ----------------------------------------------------------------------------
 // the following log targets are only compiled in if the we're compiling the
 // GUI part (andnot just the base one) of the library, they're implemented in


@@ -30,9 +34,7 @@ public:
 
 protected:
     // implement sink function
 
 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
 
 private:
     // the control we use


@@ -59,9 +61,9 @@ public:
     virtual void Flush();
 
 protected:
     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
 
     // return the title to be used for the log dialog, depending on m_bErrors
     // and m_bWarnings values


@@ -102,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
 // ----------------------------------------------------------------------------
 // (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.
 // ----------------------------------------------------------------------------
 
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------
 


@@ -138,11 +140,7 @@ public:
     virtual void OnFrameDelete(wxFrame *frame);
 
 protected:
     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
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame