removed support for Salford compiler (which was almost certainly broken anyhow) ...

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

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 33ba8d6c088ea620b84d5c15ac03cca54cfc6cf2..ae66dd0adafaff5b2059d5a5a9cd2df77bd87b4d 100644 (file)
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -32,6 +32,8 @@ 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;


@@ -59,6 +61,8 @@ 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()
+

     // empty everything
     void Clear();
 
     // empty everything
     void Clear();
 


@@ -85,8 +89,8 @@ protected:
 class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
 {
 public:
 class WXDLLEXPORT 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?
 
                 bool bShow = true,        // show window immediately?
                 bool bPassToOld = true);  // pass messages to the old target?
 


@@ -115,6 +119,9 @@ 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