solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'use-std-in-samples'

Browse source 
Use standard containers in samples.

See #23490.
This commit is contained in:
Vadim Zeitlin 2023-04-28 15:32:34 +02:00
commit cd65c312d3
7 changed files with 72 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
samples/widgets/notebook.cpp
View file

@ -33,8 +33,6 @@
#include "wx/radiobox.h"
#include "wx/statbox.h"
#include "wx/textctrl.h"
#include "wx/dynarray.h"
#endif
#include "wx/sizer.h"

8
samples/widgets/widgets.cpp
View file

@ -293,9 +293,6 @@ private:
};
#endif // USE_LOG
// array of pages
WX_DEFINE_ARRAY_PTR(WidgetsPage *, ArrayWidgetsPage);
// ----------------------------------------------------------------------------
// misc macros
// ----------------------------------------------------------------------------
@ -572,6 +569,7 @@ void WidgetsFrame::InitBook()
WidgetsBookCtrl *books[MAX_PAGES];
#endif
using ArrayWidgetsPage = std::vector<WidgetsPage*>;
ArrayWidgetsPage pages[MAX_PAGES];
wxArrayString labels[MAX_PAGES];
@ -609,7 +607,7 @@ void WidgetsFrame::InitBook()
books[cat]
#endif
, imageList);
pages[cat].Add(page);
pages[cat].push_back(page);
labels[cat].Add(info->GetLabel());
if ( cat == ALL_PAGE )
@ -645,7 +643,7 @@ void WidgetsFrame::InitBook()
#endif
// now do add them
size_t count = pages[cat].GetCount();
size_t count = pages[cat].size();
for ( size_t n = 0; n < count; n++ )
{
#if USE_TREEBOOK