X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/993b016d6cd6661918ab25475953862f97bac746..fb81ee210393b52d2cfbf02a3245076de46cb5ea:/samples/widgets/widgets.cpp diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 31d4763cce..7bf9ade91e 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -30,6 +30,7 @@ #include "wx/log.h" #include "wx/frame.h" #include "wx/menu.h" + #include "wx/image.h" #include "wx/button.h" #include "wx/checkbox.h" @@ -205,7 +206,7 @@ public: 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 @@ -214,20 +215,20 @@ private: 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 { - 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); - msg += szString; + msg += str; #ifdef __WXUNIVERSAL__ m_lbox->AppendAndEnsureVisible(msg);