X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ad2fe62d167bd7764b3d7eade75baa84a2a00e4..81f2b2ee81ce76fdc826e2740713e6fbefbfd5b3:/include/wx/generic/logg.h?ds=sidebyside diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 269c65921a..4cff569de0 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -14,6 +14,10 @@ #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 @@ -30,15 +34,13 @@ 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 wxTextCtrl *m_pTextCtrl; - DECLARE_NO_COPY_CLASS(wxLogTextCtrl) + wxDECLARE_NO_COPY_CLASS(wxLogTextCtrl); }; #endif // wxUSE_TEXTCTRL @@ -59,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 @@ -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 -// 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. // ---------------------------------------------------------------------------- @@ -138,16 +140,12 @@ 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 - DECLARE_NO_COPY_CLASS(wxLogWindow) + wxDECLARE_NO_COPY_CLASS(wxLogWindow); }; #endif // wxUSE_LOGWINDOW