X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b99891b0c8153704a9772ec8a60d548de86c531d..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/generic/logg.h?ds=sidebyside diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 3030d3bd3b..269c65921a 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -23,7 +23,7 @@ #if wxUSE_TEXTCTRL // log everything to a text window (GUI only of course) -class WXDLLEXPORT wxLogTextCtrl : public wxLog +class WXDLLIMPEXP_CORE wxLogTextCtrl : public wxLog { public: wxLogTextCtrl(wxTextCtrl *pTextCtrl); @@ -49,7 +49,7 @@ private: #if wxUSE_LOGGUI -class WXDLLEXPORT wxLogGui : public wxLog +class WXDLLIMPEXP_CORE wxLogGui : public wxLog { public: // ctor @@ -63,9 +63,18 @@ protected: wxSUPPRESS_DOLOG_HIDE_WARNING() + // return the title to be used for the log dialog, depending on m_bErrors + // and m_bWarnings values + wxString GetTitle() const; + + // return the icon (one of wxICON_XXX constants) to be used for the dialog + // depending on m_bErrors/m_bWarnings + int GetSeverityIcon() const; + // empty everything void Clear(); + wxArrayString m_aMessages; // the log message texts wxArrayInt m_aSeverity; // one of wxLOG_XXX values wxArrayLong m_aTimes; // the time of each message @@ -73,6 +82,19 @@ protected: m_bWarnings, // any warnings? m_bHasMessages; // any messages at all? +private: + // this method is called to show a single log message, it uses + // wxMessageBox() by default + virtual void DoShowSingleLogMessage(const wxString& message, + const wxString& title, + int style); + + // this method is called to show multiple log messages, it uses wxLogDialog + virtual void DoShowMultipleLogMessages(const wxArrayString& messages, + const wxArrayInt& severities, + const wxArrayLong& times, + const wxString& title, + int style); }; #endif // wxUSE_LOGGUI @@ -86,11 +108,11 @@ protected: #if wxUSE_LOGWINDOW -class WXDLLEXPORT wxLogWindow : public wxLogPassThrough +class WXDLLIMPEXP_CORE wxLogWindow : public wxLogPassThrough { public: - wxLogWindow(wxWindow *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?