* Merge from Debian experimental. Remaining Ubuntu change: - Added debian/patches/11_use-decimal-si-by-default.patch in order to comply with UnitsPolicy
for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); iter++)
28
for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter)
29
29
delete iter->second;
30
30
}
31
31
40
40
41
41
menubar->m_pMainFrame = pMainFrame;
42
42
43
43
44
44
#if FZ_MANUALUPDATECHECK
45
45
if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK))
46
46
#endif
145
145
return;
146
146
147
147
// Delete old bookmarks
148
for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_global.begin(); iter != m_bookmark_menu_id_map_global.end(); iter++)
148
for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_global.begin(); iter != m_bookmark_menu_id_map_global.end(); ++iter)
149
149
{
150
150
pMenu->Delete(iter->first);
151
151
}
152
152
m_bookmark_menu_id_map_global.clear();
153
153
154
for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_site.begin(); iter != m_bookmark_menu_id_map_site.end(); iter++)
154
for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_site.begin(); iter != m_bookmark_menu_id_map_site.end(); ++iter)
155
155
{
156
156
pMenu->Delete(iter->first);
157
157
}
173
173
{
174
174
pMenu->AppendSeparator();
175
175
176
for (std::list<wxString>::const_iterator iter = global_bookmarks.begin(); iter != global_bookmarks.end(); iter++)
176
for (std::list<wxString>::const_iterator iter = global_bookmarks.begin(); iter != global_bookmarks.end(); ++iter)
177
177
{
178
178
int id;
179
179
if (ids == m_bookmark_menu_ids.end())
184
184
else
185
185
{
186
186
id = *ids;
187
ids++;
187
++ids;
188
188
}
189
189
wxString name(*iter);
190
190
name.Replace(_T("&"), _T("&&"));
205
205
206
206
pMenu->AppendSeparator();
207
207
208
for (std::list<wxString>::const_iterator iter = controls->site_bookmarks->bookmarks.begin(); iter != controls->site_bookmarks->bookmarks.end(); iter++)
208
for (std::list<wxString>::const_iterator iter = controls->site_bookmarks->bookmarks.begin(); iter != controls->site_bookmarks->bookmarks.end(); ++iter)