Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_LOG fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-20 19:11:34 +00:00
parent fe5ddd9250
commit f07941fc73
7 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/notebook/notebook.cpp
View File

@@ -275,10 +275,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
m_btnExit = new wxButton( m_panel, wxID_OK, wxT("&Exit") );
m_btnExit->SetDefault();
#if wxUSE_LOG
m_text = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
m_logTargetOld = wxLog::SetActiveTarget( new wxLogTextCtrl(m_text) );
#endif // wxUSE_LOG
// Set sizers
m_sizerFrame = new wxBoxSizer(wxVERTICAL);
@@ -308,7 +310,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
m_sizerFrame->Add(m_sizerTop, 1, wxEXPAND);
#if wxUSE_LOG
m_sizerFrame->Add(m_text, 0, wxEXPAND);
#endif // wxUSE_LOG
ReInitNotebook();
m_notebook->CreateInitialPages();
@@ -324,7 +328,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
MyFrame::~MyFrame()
{
#if wxUSE_LOG
delete wxLog::SetActiveTarget(m_logTargetOld);
#endif // wxUSE_LOG
if (m_imageList)
{
@@ -530,7 +536,9 @@ void MyFrame::OnNotebook(wxNotebookEvent& event)
wxLogMessage(wxT("Notebook event #%d: %s (%d)"),
s_numNotebookEvents++, str.c_str(), eventType);
#if wxUSE_LOG
m_text->SetInsertionPointEnd();
#endif // wxUSE_LOG
event.Skip();
}