- for (CategoryMap::iterator i = categories.begin(); i != categories.end(); ++i) {
-
- wxStaticText* c = new StaticText (panel, std_to_wx(i->first));
- wxFont font = c->GetFont();
+ for (auto const& i: categories) {
+ auto c = new StaticText (panel, std_to_wx(i.first));
+ auto font = c->GetFont();