X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dabbc6a5a1795d169f26ce95927f3e4f1a5e7b7e..d7640339e92492ee1ee32384f471cce0f9f169fa:/include/wx/generic/logg.h?ds=inline diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 16418df233..ae66dd0ada 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -12,10 +12,6 @@ #ifndef _WX_LOGG_H_ #define _WX_LOGG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "logg.h" -#endif - #if wxUSE_GUI // ---------------------------------------------------------------------------- @@ -32,10 +28,13 @@ class WXDLLEXPORT wxLogTextCtrl : public wxLog public: wxLogTextCtrl(wxTextCtrl *pTextCtrl); -private: +protected: // implement sink function - virtual void DoLogString(const wxChar *szString, time_t t); + virtual void DoLogString(const wxString& szString, time_t t); + + wxSUPPRESS_DOLOGSTRING_HIDE_WARNING() +private: // the control we use wxTextCtrl *m_pTextCtrl; @@ -60,7 +59,9 @@ public: virtual void Flush(); protected: - virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t); + virtual void DoLog(wxLogLevel level, const wxString& szString, time_t t); + + wxSUPPRESS_DOLOG_HIDE_WARNING() // empty everything void Clear(); @@ -88,12 +89,12 @@ protected: class WXDLLEXPORT wxLogWindow : public wxLogPassThrough { public: - wxLogWindow(wxFrame *pParent, // the parent frame (can be NULL) - const wxChar *szTitle, // the title of the frame + wxLogWindow(wxWindow *pParent, // the parent frame (can be NULL) + const wxString& szTitle, // the title of the frame bool bShow = true, // show window immediately? bool bPassToOld = true); // pass messages to the old target? - ~wxLogWindow(); + virtual ~wxLogWindow(); // window operations // show/hide the log window @@ -115,8 +116,11 @@ public: virtual void OnFrameDelete(wxFrame *frame); protected: - virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t); - virtual void DoLogString(const wxChar *szString, time_t t); + 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() private: wxLogFrame *m_pLogFrame; // the log frame