minor cleanup

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

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 2d8c217cf7d2791eaaaea4e04c47247c8049925d..0edbed19a611534670cddf7b685d393c93b076af 100644 (file)
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -86,7 +86,7 @@ enum Orient
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:
-    NotebookWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
     virtual ~NotebookWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_notebook; }
@@ -192,7 +192,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"));
 
-NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrl *book,
+NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrlBase *book,
                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {
@@ -211,22 +211,19 @@ NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrl *book,
     wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
 
     // must be in sync with Orient enum
-    wxString orientations[] =
-    {
-        _T("&top"),
-        _T("&bottom"),
-        _T("&left"),
-        _T("&right"),
-    };
+    wxArrayString orientations;
+    orientations.Add(_T("&top"));
+    orientations.Add(_T("&bottom"));
+    orientations.Add(_T("&left"));
+    orientations.Add(_T("&right"));
 
-    wxASSERT_MSG( WXSIZEOF(orientations) == Orient_Max,
+    wxASSERT_MSG( orientations.GetCount() == Orient_Max,
                   _T("forgot to update something") );
 
     m_chkImages = new wxCheckBox(this, wxID_ANY, _T("Show &images"));
     m_radioOrient = new wxRadioBox(this, wxID_ANY, _T("&Tab orientation"),
                                    wxDefaultPosition, wxDefaultSize,
-                                   WXSIZEOF(orientations), orientations,
-                                   1, wxRA_SPECIFY_COLS);
+                                   orientations, 1, wxRA_SPECIFY_COLS);
 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
@@ -355,19 +352,19 @@ void NotebookWidgetsPage::CreateNotebook()
             // fall through
 
         case Orient_Top:
-            flags = wxNB_TOP;
+            flags = wxBK_TOP;
             break;
 
         case Orient_Bottom:
-            flags = wxNB_BOTTOM;
+            flags = wxBK_BOTTOM;
             break;
 
         case Orient_Left:
-            flags = wxNB_LEFT;
+            flags = wxBK_LEFT;
             break;
 
         case Orient_Right:
-            flags = wxNB_RIGHT;
+            flags = wxBK_RIGHT;
             break;
     }
 
@@ -506,7 +503,7 @@ void NotebookWidgetsPage::OnUpdateUIRemoveButton(wxUpdateUIEvent& event)
 void NotebookWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {
     event.Enable( !m_chkImages->GetValue() ||
-                  m_radioOrient->GetSelection() != wxNB_TOP );
+                  m_radioOrient->GetSelection() != wxBK_TOP );
 }
 
 void NotebookWidgetsPage::OnUpdateUINumPagesText(wxUpdateUIEvent& event)