X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f1b63efe8993c6c0460354bc2da7331526d43efa:/include/wx/generic/logg.h

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index c506e327f9..269c65921a 100644
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -23,15 +23,18 @@
 #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);
 
-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;
 
@@ -46,7 +49,7 @@ private:
 
 #if wxUSE_LOGGUI
 
-class WXDLLEXPORT wxLogGui : public wxLog
+class WXDLLIMPEXP_CORE wxLogGui : public wxLog
 {
 public:
     // ctor
@@ -56,11 +59,22 @@ 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()
+
+    // 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
@@ -68,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
@@ -81,15 +108,15 @@ 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?
 
-    ~wxLogWindow();
+    virtual ~wxLogWindow();
 
     // window operations
         // show/hide the log window
@@ -111,8 +138,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