Warning fixes.

[wxWidgets.git] / samples / widgets / notebook.cpp

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 5c6d1bac041988bba180c92b09f46cecdb779686..68d6647d5d91b1ca32f308d1d9dc4a867ed0e85c 100644 (file)
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample
 // Name:        notebook.cpp
 // Purpose:     Part of the widgets sample showing wxNotebook
 // Author:      Vadim Zeitlin
@@ -78,7 +78,7 @@ enum Orient
     Orient_Max
 };
 
-// old versions of wxWindows don't define this style
+// old versions of wxWidgets don't define this style
 #ifndef wxNB_TOP
     #define wxNB_TOP (0)
 #endif
@@ -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 )