Simplify some iterations over lists

src/Menus.cpp

@@ -2882,13 +2882,12 @@ void AudacityProject::PrevFrame()
 void AudacityProject::NextWindow()
 {
    wxWindow *w = wxGetTopLevelParent(wxWindow::FindFocus());
-   const wxWindowList & list = GetChildren();
+   const auto & list = GetChildren();
-   wxWindowList::compatibility_iterator iter;
+   auto iter = list.begin(), end = list.end();
 
    // If the project window has the current focus, start the search with the first child
    if (w == this)
    {
-      iter = list.GetFirst();
    }
    // Otherwise start the search with the current window's next sibling
    else
@@ -2896,31 +2895,27 @@ void AudacityProject::NextWindow()
       // Find the window in this projects children.  If the window with the
       // focus isn't a child of this project (like when a dialog is created
       // without specifying a parent), then we'll get back NULL here.
-      iter = list.Find(w);
+      while (iter != end && *iter != w)
-      if (iter)
+         ++iter;
-      {
+      if (iter != end)
-         iter = iter->GetNext();
+         ++iter;
-      }
    }
 
    // Search for the next toplevel window
-   while (iter)
+   for (; iter != end; ++iter)
    {
       // If it's a toplevel, visible (we have hidden windows) and is enabled,
       // then we're done.  The IsEnabled() prevents us from moving away from 
       // a modal dialog because all other toplevel windows will be disabled.
-      w = iter->GetData();
+      w = *iter;
       if (w->IsTopLevel() && w->IsShown() && w->IsEnabled())
       {
          break;
       }
-
-      // Get the next sibling
-      iter = iter->GetNext();
    }
 
    // Ran out of siblings, so make the current project active
-   if (!iter && IsEnabled())
+   if ((iter == end) && IsEnabled())
    {
       w = this;
    }
@@ -2943,43 +2938,35 @@ void AudacityProject::NextWindow()
 void AudacityProject::PrevWindow()
 {
    wxWindow *w = wxGetTopLevelParent(wxWindow::FindFocus());
-   const wxWindowList & list = GetChildren();
+   const auto & list = GetChildren();
-   wxWindowList::compatibility_iterator iter;
+   auto iter = list.rbegin(), end = list.rend();
 
    // If the project window has the current focus, start the search with the last child
    if (w == this)
    {
-      iter = list.GetLast();
    }
    // Otherwise start the search with the current window's previous sibling
    else
    {
-      if (list.Find(w))
+      while (iter != end && *iter != w)
-         iter = list.Find(w)->GetPrevious();
+         ++iter;
+      if (iter != end)
+         ++iter;
    }
 
    // Search for the previous toplevel window
-   while (iter)
+   for (; iter != end; ++iter)
    {
       // If it's a toplevel and is visible (we have come hidden windows), then we're done
-      w = iter->GetData();
+      w = *iter;
       if (w->IsTopLevel() && w->IsShown() && IsEnabled())
       {
          break;
       }
-
-      // Find the window in this projects children.  If the window with the
-      // focus isn't a child of this project (like when a dialog is created
-      // without specifying a parent), then we'll get back NULL here.
-      iter = list.Find(w);
-      if (iter)
-      {
-         iter = iter->GetPrevious();
-      }
    }
 
    // Ran out of siblings, so make the current project active
-   if (!iter && IsEnabled())
+   if ((iter == end) && IsEnabled())
    {
       w = this;
    }

src/TrackPanel.cpp

@@ -8272,14 +8272,11 @@ int TrackPanel::IdOfFormat( int format )
 /// Puts a check mark at a given position in a menu.
 void TrackPanel::SetMenuCheck( wxMenu & menu, int newId )
 {
-   wxMenuItemList & list = menu.GetMenuItems();
+   auto & list = menu.GetMenuItems();
-   wxMenuItem * item;
-   int id;
 
-   for ( wxMenuItemList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
+   for ( auto item : list )
    {
-      item = node->GetData();
+      auto id = item->GetId();
-      id = item->GetId();
       // We only need to set check marks. Clearing checks causes problems on Linux (bug 851)
       if (id==newId)
          menu.Check( id, true );

src/widgets/ExpandingToolBar.cpp

@@ -321,12 +321,8 @@ void ExpandingToolBar::RecursivelyPushEventHandlers(wxWindow *win)
    }
 
    wxWindowList children = win->GetChildren();
-
+   for(auto child : children)
-   typedef wxWindowList::compatibility_iterator Node;
-   for(Node node = children.GetFirst(); node; node = node->GetNext()) {
-      wxWindow *child = node->GetData();
       RecursivelyPushEventHandlers(child);
-   }
 }
 
 bool ExpandingToolBar::Layout()

src/widgets/FileHistory.cpp

@@ -166,11 +166,8 @@ void FileHistory::AddFilesToMenu()
 void FileHistory::AddFilesToMenu(wxMenu *menu)
 {
    wxMenuItemList items = menu->GetMenuItems();
-   wxMenuItemList::compatibility_iterator node = items.GetFirst();
+   for (auto end = items.end(), iter = items.begin(); iter != end;)
-   while (node) {
+      menu->Destroy(*iter++);
-      menu->Destroy((wxMenuItem *) node->GetData());
-      node = node->GetNext();
-   }
 
    for (size_t i = 0; i < mHistory.GetCount(); i++) {
       menu->Append(mIDBase + 1 + i, mHistory[i]);

src/widgets/ProgressDialog.cpp

@@ -1482,15 +1482,12 @@ void ProgressDialog::SetMessage(const wxString & message)
 //
 bool ProgressDialog::SearchForWindow(const wxWindowList & list, const wxWindow *searchfor) const
 {
-   wxWindowList::compatibility_iterator node = list.GetFirst();
+   for (auto win : list)
-   while (node)
    {
-      wxWindow *win = node->GetData();
       if (win == searchfor || SearchForWindow(win->GetChildren(), searchfor))
       {
          return true;
       }
-      node = node->GetNext();
    }
 
    return false;