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

Applied patch [ 1039953 ] Fix notebook functionality in widgets sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-10-07 16:38:48 +00:00
parent 2006289b74
commit fd76d9633a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/widgets/notebook.cpp
View File

@@ -353,7 +353,7 @@ void NotebookWidgetsPage::CreateNotebook()
switch ( m_radioOrient->GetSelection() ) switch ( m_radioOrient->GetSelection() )
{ {
default: default:
wxFAIL_MSG( _T("unknown notebok orientation") ); wxFAIL_MSG( _T("unknown notebook orientation") );
// fall through // fall through
case Orient_Top: case Orient_Top:
@@ -373,7 +373,7 @@ void NotebookWidgetsPage::CreateNotebook()
break; break;
} }
wxNotebook *notebook = m_notebook; wxNotebook *old_note = m_notebook;
m_notebook = new wxNotebook(this, NotebookPage_Notebook, m_notebook = new wxNotebook(this, NotebookPage_Notebook,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
@@ -381,23 +381,24 @@ void NotebookWidgetsPage::CreateNotebook()
CreateImageList(); CreateImageList();
if ( notebook ) if ( old_note )
{ {
const int sel = notebook->GetSelection(); const int sel = old_note->GetSelection();
const int count = notebook->GetPageCount(); const int count = old_note->GetPageCount();
// recreate the pages // recreate the pages
for ( int n = 0; n < count; n++ ) for ( int n = 0; n < count; n++ )
{ {
m_notebook->AddPage(CreateNewPage(), m_notebook->AddPage(CreateNewPage(),
notebook->GetPageText(n), old_note->GetPageText(n),
false, false,
notebook->GetPageImage(n)); m_chkImages->GetValue() ?
GetIconIndex() : -1);
} }
m_sizerNotebook->Detach( notebook ); m_sizerNotebook->Detach( old_note );
delete notebook; delete old_note;
// restore selection // restore selection
if ( sel != -1 ) if ( sel != -1 )