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

Use a helper lambda for naming history menu items

Browse source 
Shorten the code a bit more.

No real changes.
This commit is contained in:
Vadim Zeitlin 2024-02-02 18:01:24 +01:00
parent 44bc26f087
commit 9c33be4f5e
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
samples/webview/webview.cpp
View file

@ -1207,22 +1207,23 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
}
m_histMenuItems.clear();
// We can't use empty labels for the menu items, so use this helper to give
// them at least some name if we don't have anything better.
const auto makeLabel = [](const wxString& title)
{
return title.empty() ? "(untitled)" : title;
};
wxMenuItem* item;
for ( const auto& histItem : m_browser->GetBackwardHistory() )
{
wxString title = histItem->GetTitle();
if ( title.empty() )
title = "(untitled)";
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(histItem->GetTitle()));
m_histMenuItems[item->GetId()] = histItem;
Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId());
}
wxString title = m_browser->GetCurrentTitle();
if ( title.empty() )
title = "(untitled)";
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(m_browser->GetCurrentTitle()));
item->Check();
//No need to connect the current item
@ -1230,10 +1231,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
for ( const auto& histItem : m_browser->GetForwardHistory() )
{
wxString title = histItem->GetTitle();
if ( title.empty() )
title = "(untitled)";
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, makeLabel(histItem->GetTitle()));
m_histMenuItems[item->GetId()] = histItem;
Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId());
}