From: Václav Slavík Date: Thu, 28 Jun 2007 16:59:06 +0000 (+0000) Subject: don't use wxChar* arguments in wxLogWindow API X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/46ff9bd5ddc9c55598eeeecfd8945a54a60cca65 don't use wxChar* arguments in wxLogWindow API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 3030d3bd3b..ae66dd0ada 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -89,8 +89,8 @@ protected: 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? diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 04656f2d6f..abc1c6ae6f 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -469,7 +469,7 @@ class wxLogFrame : public wxFrame { public: // ctor & dtor - wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle); + wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle); virtual ~wxLogFrame(); // menu callbacks @@ -513,7 +513,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) EVT_CLOSE(wxLogFrame::OnCloseWindow) END_EVENT_TABLE() -wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle) +wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle) : wxFrame(pParent, wxID_ANY, szTitle) { m_log = log; @@ -621,7 +621,7 @@ wxLogFrame::~wxLogFrame() // ----------- wxLogWindow::wxLogWindow(wxWindow *pParent, - const wxChar *szTitle, + const wxString& szTitle, bool bShow, bool bDoPass) {