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

fixed crash in text ctrl log on exit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-21 18:44:15 +00:00
parent c7d176e2bf
commit d847e69ac7
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/text/text.cpp
View File

@@ -100,6 +100,7 @@ class MyPanel: public wxPanel
{ {
public: public:
MyPanel(wxFrame *frame, int x, int y, int w, int h); MyPanel(wxFrame *frame, int x, int y, int w, int h);
virtual ~MyPanel() { wxLog::SetActiveTarget(m_logOld); }
#if wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
void DoPasteFromClipboard(); void DoPasteFromClipboard();
@@ -126,6 +127,8 @@ public:
wxTextCtrl *m_log; wxTextCtrl *m_log;
wxLog *m_logOld;
private: private:
// get the currently focused text control or return the default one is no // get the currently focused text control or return the default one is no
// text ctrl has focus // text ctrl has focus
@@ -787,9 +790,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
wxPoint(5,260), wxSize(630,100), wxPoint(5,260), wxSize(630,100),
wxTE_MULTILINE | wxTE_READONLY /* | wxTE_RICH */); wxTE_MULTILINE | wxTE_READONLY /* | wxTE_RICH */);
wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) ); m_logOld = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
delete old_log;
// single line text controls // single line text controls
@@ -884,7 +885,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
// wxTE_AUTO_URL | // wxTE_AUTO_URL |
wxHSCROLL); wxHSCROLL);
#if 1
m_textrich->SetStyle(0, 10, *wxRED); m_textrich->SetStyle(0, 10, *wxRED);
m_textrich->SetStyle(10, 20, *wxBLUE); m_textrich->SetStyle(10, 20, *wxBLUE);
m_textrich->SetStyle(30, 40, m_textrich->SetStyle(30, 40,
@@ -899,16 +899,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE, *wxWHITE)); m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE, *wxWHITE));
m_textrich->AppendText(_T("And this should be in blue and the text you ") m_textrich->AppendText(_T("And this should be in blue and the text you ")
_T("type should be in blue as well")); _T("type should be in blue as well"));
#else
m_textrich->SetFont(wxFont(12, wxFONTFAMILY_TELETYPE,
wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
m_textrich->SetDefaultStyle(wxTextAttr(*wxRED));
m_textrich->AppendText(_T("Red text\n"));
m_textrich->SetDefaultStyle(wxTextAttr(wxNullColour, *wxLIGHT_GREY));
m_textrich->AppendText(_T("Red on grey text\n"));
m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE));
m_textrich->AppendText(_T("Blue on grey text\n"));
#endif
} }
void MyPanel::OnSize( wxSizeEvent &event ) void MyPanel::OnSize( wxSizeEvent &event )