X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/generic/logg.h?ds=sidebyside

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 1eefe6c5fa..4cff569de0 100644
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -6,18 +6,18 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_LOGG_H_
 #define   _WX_LOGG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "logg.h"
-#endif
-
 #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
@@ -27,19 +27,20 @@
 #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 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
@@ -50,7 +51,7 @@ private:
 
 #if wxUSE_LOGGUI
 
-class WXDLLEXPORT wxLogGui : public wxLog
+class WXDLLIMPEXP_CORE wxLogGui : public wxLog
 {
 public:
     // ctor
@@ -60,11 +61,22 @@ public:
     virtual void Flush();
 
 protected:
-    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);
+    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
+    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
@@ -72,6 +84,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
@@ -79,25 +104,25 @@ protected:
 // ----------------------------------------------------------------------------
 // (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.
 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOGWINDOW
 
-class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
+class WXDLLIMPEXP_CORE 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 +132,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,13 +140,12 @@ 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 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