From 045bd076c541c2ee43483d94aeab1ecb031614ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 22 Mar 2006 18:07:19 +0000 Subject: [PATCH] Test both constuctors. Warning fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/widgets/notebook.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 44279c70d1..0edbed19a6 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -211,22 +211,19 @@ NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrlBase *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); -- 2.45.2