don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / generic / logg.h

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 33ba8d6c088ea620b84d5c15ac03cca54cfc6cf2..627de9420772f31626d2324ed801bcc7c068af17 100644 (file)
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -14,6 +14,10 @@
 
 #if wxUSE_GUI
 
 
 #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
 // ----------------------------------------------------------------------------
 // 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


@@ -23,7 +27,7 @@
 #if wxUSE_TEXTCTRL
 
 // log everything to a text window (GUI only of course)
 #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);
 {
 public:
     wxLogTextCtrl(wxTextCtrl *pTextCtrl);


@@ -32,11 +36,13 @@ protected:
     // implement sink function
     virtual void DoLogString(const wxString& szString, time_t t);
 
     // implement sink function
     virtual void DoLogString(const wxString& szString, time_t t);
 

+    wxSUPPRESS_DOLOGSTRING_HIDE_WARNING()
+

 private:
     // the control we use
     wxTextCtrl *m_pTextCtrl;
 
 private:
     // the control we use
     wxTextCtrl *m_pTextCtrl;
 

-    DECLARE_NO_COPY_CLASS(wxLogTextCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxLogTextCtrl);

 };
 
 #endif // wxUSE_TEXTCTRL
 };
 
 #endif // wxUSE_TEXTCTRL


@@ -47,7 +53,7 @@ private:
 
 #if wxUSE_LOGGUI
 
 
 #if wxUSE_LOGGUI
 

-class WXDLLEXPORT wxLogGui : public wxLog
+class WXDLLIMPEXP_CORE wxLogGui : public wxLog

 {
 public:
     // ctor
 {
 public:
     // ctor


@@ -59,9 +65,20 @@ public:
 protected:
     virtual void DoLog(wxLogLevel level, const wxString& szString, time_t t);
 
 protected:
     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();
 
     // 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
     wxArrayString m_aMessages;      // the log message texts
     wxArrayInt    m_aSeverity;      // one of wxLOG_XXX values
     wxArrayLong   m_aTimes;         // the time of each message


@@ -69,6 +86,19 @@ protected:
                   m_bWarnings,      // any warnings?
                   m_bHasMessages;   // any messages at all?
 
                   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
 };
 
 #endif // wxUSE_LOGGUI


@@ -82,11 +112,11 @@ protected:
 
 #if wxUSE_LOGWINDOW
 
 
 #if wxUSE_LOGWINDOW
 

-class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
+class WXDLLIMPEXP_CORE wxLogWindow : public wxLogPassThrough

 {
 public:
 {
 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?
 
                 bool bShow = true,        // show window immediately?
                 bool bPassToOld = true);  // pass messages to the old target?
 


@@ -115,10 +145,13 @@ protected:
     virtual void DoLog(wxLogLevel level, const wxString& szString, time_t t);
     virtual void DoLogString(const wxString& 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
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame
 

-    DECLARE_NO_COPY_CLASS(wxLogWindow)
+    wxDECLARE_NO_COPY_CLASS(wxLogWindow);

 };
 
 #endif // wxUSE_LOGWINDOW
 };
 
 #endif // wxUSE_LOGWINDOW