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

Use range-for loops for iterating over wxWebViewHistoryItems

Browse source 
No real changes, just simplify the code a bit.
This commit is contained in:
Vadim Zeitlin 2024-02-02 17:59:01 +01:00
parent 3ef1aee986
commit 44bc26f087
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
samples/webview/webview.cpp
View file

@ -1207,19 +1207,15 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
}
m_histMenuItems.clear();
wxVector<wxSharedPtr<wxWebViewHistoryItem> > back = m_browser->GetBackwardHistory();
wxVector<wxSharedPtr<wxWebViewHistoryItem> > forward = m_browser->GetForwardHistory();
wxMenuItem* item;
unsigned int i;
for(i = 0; i < back.size(); i++)
for ( const auto& histItem : m_browser->GetBackwardHistory() )
{
wxString title = back[i]->GetTitle();
wxString title = histItem->GetTitle();
if ( title.empty() )
title = "(untitled)";
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
m_histMenuItems[item->GetId()] = back[i];
m_histMenuItems[item->GetId()] = histItem;
Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId());
}
@ -1232,13 +1228,13 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
//No need to connect the current item
m_histMenuItems[item->GetId()] = wxSharedPtr<wxWebViewHistoryItem>(new wxWebViewHistoryItem(m_browser->GetCurrentURL(), m_browser->GetCurrentTitle()));
for(i = 0; i < forward.size(); i++)
for ( const auto& histItem : m_browser->GetForwardHistory() )
{
wxString title = forward[i]->GetTitle();
wxString title = histItem->GetTitle();
if ( title.empty() )
title = "(untitled)";
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
m_histMenuItems[item->GetId()] = forward[i];
m_histMenuItems[item->GetId()] = histItem;
Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId());
}