[ 1945434 ] Changing method wxComboCtrlBase::DrawButton to virtual one

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

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 26caf21bb01b2592342bb816b854a735d9c08db5..02273173231aba0ec4b1a135e608dde33a9a9d51 100644 (file)
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -12,10 +12,6 @@
 #ifndef   _WX_LOGG_H_
 #define   _WX_LOGG_H_
 
 #ifndef   _WX_LOGG_H_
 #define   _WX_LOGG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "logg.h"
-#endif
-

 #if wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #if wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -27,15 +23,18 @@
 #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);
 

-private:
+protected:

     // implement sink function
     // 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;
 
     // the control we use
     wxTextCtrl *m_pTextCtrl;
 


@@ -50,7 +49,7 @@ private:
 
 #if wxUSE_LOGGUI
 
 
 #if wxUSE_LOGGUI
 

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

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


@@ -60,7 +59,9 @@ public:
     virtual void Flush();
 
 protected:
     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()

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


@@ -85,15 +86,15 @@ 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?
 

-    ~wxLogWindow();
+    virtual ~wxLogWindow();

 
     // window operations
         // show/hide the log window
 
     // window operations
         // show/hide the log window


@@ -115,8 +116,11 @@ public:
     virtual void OnFrameDelete(wxFrame *frame);
 
 protected:
     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
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame