X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..d7640339e92492ee1ee32384f471cce0f9f169fa:/include/wx/generic/logg.h?ds=inline diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 5d4a9a008e..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; @@ -45,7 +44,7 @@ private: #endif // wxUSE_TEXTCTRL // ---------------------------------------------------------------------------- -// GUI log target, the default one for wxWindows programs +// GUI log target, the default one for wxWidgets programs // ---------------------------------------------------------------------------- #if wxUSE_LOGGUI @@ -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,16 +89,16 @@ protected: class WXDLLEXPORT wxLogWindow : public wxLogPassThrough { public: - wxLogWindow(wxFrame *pParent, // the parent frame (can be NULL) - const wxChar *szTitle, // the title of the frame - bool bShow = TRUE, // show window immediately? - bool bPassToOld = TRUE); // pass messages to the old target? + 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 - void Show(bool bShow = TRUE); + void Show(bool bShow = true); // retrieve the pointer to the frame wxFrame *GetFrame() const; @@ -107,7 +108,7 @@ public: 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 + // exits) - return true from here to allow the frame to close, false // to prevent this from happening virtual bool OnFrameClose(wxFrame *frame); // called right before the log frame is going to be deleted: will @@ -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