From fd76d9633a4235abc1faa3175bc43bcf099aa3ca Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 7 Oct 2004 16:38:48 +0000
Subject: [PATCH] Applied patch [ 1039953 ] Fix notebook functionality in
 widgets sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/widgets/notebook.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index adfbb5ad2e..68d6647d5d 100644
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -353,7 +353,7 @@ void NotebookWidgetsPage::CreateNotebook()
     switch ( m_radioOrient->GetSelection() )
     {
         default:
-            wxFAIL_MSG( _T("unknown notebok orientation") );
+            wxFAIL_MSG( _T("unknown notebook orientation") );
             // fall through
 
         case Orient_Top:
@@ -373,7 +373,7 @@ void NotebookWidgetsPage::CreateNotebook()
             break;
     }
 
-    wxNotebook *notebook = m_notebook;
+    wxNotebook *old_note = m_notebook;
 
     m_notebook = new wxNotebook(this, NotebookPage_Notebook,
                                 wxDefaultPosition, wxDefaultSize,
@@ -381,23 +381,24 @@ void NotebookWidgetsPage::CreateNotebook()
 
     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
         for ( int n = 0; n < count; n++ )
         {
             m_notebook->AddPage(CreateNewPage(),
-                                notebook->GetPageText(n),
+                                old_note->GetPageText(n),
                                 false,
-                                notebook->GetPageImage(n));
+																m_chkImages->GetValue() ?
+                                GetIconIndex() : -1);
         }
 
-        m_sizerNotebook->Detach( notebook );
-        delete notebook;
+        m_sizerNotebook->Detach( old_note );
+        delete old_note;
 
         // restore selection
         if ( sel != -1 )