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
This commit is contained in:
		@@ -206,7 +206,7 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
    // implement sink functions
 | 
					    // 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
 | 
					        // don't put trace messages into listbox or we can get into infinite
 | 
				
			||||||
        // recursion
 | 
					        // recursion
 | 
				
			||||||
@@ -215,20 +215,20 @@ private:
 | 
				
			|||||||
            if ( m_logOld )
 | 
					            if ( m_logOld )
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                // cast is needed to call protected method
 | 
					                // 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;
 | 
					        wxString msg;
 | 
				
			||||||
        TimeStamp(&msg);
 | 
					        TimeStamp(&msg);
 | 
				
			||||||
        msg += szString;
 | 
					        msg += str;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        #ifdef __WXUNIVERSAL__
 | 
					        #ifdef __WXUNIVERSAL__
 | 
				
			||||||
            m_lbox->AppendAndEnsureVisible(msg);
 | 
					            m_lbox->AppendAndEnsureVisible(msg);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user