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

Don't show log menu tiems in the tree control sample when !wxUSE_LOG.

Browse Source 
No real changes, just correct the "#if wxUSE_LOG" placement.

See #4024.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-02-06 12:43:48 +00:00
parent ff0d660405
commit d6b180ec36
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/treectrl/treetest.cpp
View File

@@ -227,8 +227,10 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
*tree_menu = new wxMenu, *tree_menu = new wxMenu,
*item_menu = new wxMenu; *item_menu = new wxMenu;
#if wxUSE_LOG
file_menu->Append(TreeTest_ClearLog, wxT("&Clear log\tCtrl-L")); file_menu->Append(TreeTest_ClearLog, wxT("&Clear log\tCtrl-L"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
#endif // wxUSE_LOG
file_menu->Append(TreeTest_About, wxT("&About")); file_menu->Append(TreeTest_About, wxT("&About"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(TreeTest_Quit, wxT("E&xit\tAlt-X")); file_menu->Append(TreeTest_Quit, wxT("E&xit\tAlt-X"));
@@ -336,6 +338,16 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
m_textCtrl = new wxTextCtrl(m_panel, wxID_ANY, wxT(""), m_textCtrl = new wxTextCtrl(m_panel, wxID_ANY, wxT(""),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxSUNKEN_BORDER); wxTE_MULTILINE | wxSUNKEN_BORDER);
#ifdef __WXMOTIF__
// For some reason, we get a memcpy crash in wxLogStream::DoLogStream
// on gcc/wxMotif, if we use wxLogTextCtl. Maybe it's just gcc?
delete wxLog::SetActiveTarget(new wxLogStderr);
#else
// set our text control as the log target
wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl);
delete wxLog::SetActiveTarget(logWindow);
#endif
#endif // wxUSE_LOG #endif // wxUSE_LOG
CreateTreeWithDefStyle(); CreateTreeWithDefStyle();
@@ -349,18 +361,6 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
// create a status bar // create a status bar
CreateStatusBar(2); CreateStatusBar(2);
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
#if wxUSE_LOG
#ifdef __WXMOTIF__
// For some reason, we get a memcpy crash in wxLogStream::DoLogStream
// on gcc/wxMotif, if we use wxLogTextCtl. Maybe it's just gcc?
delete wxLog::SetActiveTarget(new wxLogStderr);
#else
// set our text control as the log target
wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl);
delete wxLog::SetActiveTarget(logWindow);
#endif
#endif // wxUSE_LOG
} }
MyFrame::~MyFrame() MyFrame::~MyFrame()