merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -439,11 +439,13 @@ void MyFrame::OnButtonAddPage( wxCommandEvent& WXUNUSED(event) )
static size_t s_pageAdded = 0;
wxPanel *panel = new wxPanel( m_notebook, -1 );
(void) new wxButton( panel, -1, wxT("Button"),
(void) new wxButton( panel, -1, wxT("Frist button"),
wxPoint(10, 10), wxSize(-1, -1) );
(void) new wxButton( panel, -1, wxT("Second button"),
wxPoint(50, 100), wxSize(-1, -1) );
m_notebook->AddPage(panel, wxString::Format(ADDED_PAGE_NAME wxT("%u"),
++s_pageAdded), FALSE, m_notebook->GetIconIndex() );
++s_pageAdded), TRUE, m_notebook->GetIconIndex() );
}
void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) )