override DoLog(wxString) and not the deprecated DoLog(wxChar*) in LboxLogger

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index f0e31be92493590337621d7c1635c40590e97957..7bf9ade91ed37d01ec78d4498aabd685da8c6170 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -206,7 +206,7 @@ public:
 
 private:
     // implement sink functions
 
 private:
     // implement sink functions

-    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+    virtual void DoLog(wxLogLevel level, const wxString& str, time_t t)

     {
         // don't put trace messages into listbox or we can get into infinite
         // recursion
     {
         // don't put trace messages into listbox or we can get into infinite
         // recursion


@@ -215,20 +215,20 @@ private:
             if ( m_logOld )
             {
                 // cast is needed to call protected method
             if ( m_logOld )
             {
                 // cast is needed to call protected method

-                ((LboxLogger *)m_logOld)->DoLog(level, szString, t);
+                ((LboxLogger *)m_logOld)->DoLog(level, str, t);

             }
         }
         else
         {
             }
         }
         else
         {

-            wxLog::DoLog(level, szString, t);
+            wxLog::DoLog(level, str, t);

         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+    virtual void DoLogString(const wxString& str, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);

-        msg += szString;
+        msg += str;

 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);
 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);