mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 05:09:34 -06:00
wxMenu objects are now deleted by wxwidgets - should fix a few GUI-related crashes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4602 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -537,9 +537,9 @@ void CISOProperties::OnCloseClick(wxCommandEvent& WXUNUSED (event))
|
||||
|
||||
void CISOProperties::RightClickOnBanner(wxMouseEvent& event)
|
||||
{
|
||||
wxMenu popupMenu;
|
||||
popupMenu.Append(IDM_BNRSAVEAS, _("Save as..."));
|
||||
PopupMenu(&popupMenu);
|
||||
wxMenu* popupMenu = new wxMenu;
|
||||
popupMenu->Append(IDM_BNRSAVEAS, _("Save as..."));
|
||||
PopupMenu(popupMenu);
|
||||
|
||||
event.Skip();
|
||||
}
|
||||
@ -560,19 +560,19 @@ void CISOProperties::OnRightClickOnTree(wxTreeEvent& event)
|
||||
{
|
||||
m_Treectrl->SelectItem(event.GetItem());
|
||||
|
||||
wxMenu popupMenu;
|
||||
wxMenu* popupMenu = new wxMenu;
|
||||
|
||||
if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0
|
||||
&& m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
|
||||
popupMenu.Append(IDM_EXTRACTDIR, _("Extract Partition..."));
|
||||
popupMenu->Append(IDM_EXTRACTDIR, _("Extract Partition..."));
|
||||
else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 1)
|
||||
popupMenu.Append(IDM_EXTRACTDIR, _("Extract Directory..."));
|
||||
popupMenu->Append(IDM_EXTRACTDIR, _("Extract Directory..."));
|
||||
else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 2)
|
||||
popupMenu.Append(IDM_EXTRACTFILE, _("Extract File..."));
|
||||
popupMenu->Append(IDM_EXTRACTFILE, _("Extract File..."));
|
||||
|
||||
popupMenu.Append(IDM_EXTRACTALL, _("Extract All Files..."));
|
||||
popupMenu->Append(IDM_EXTRACTALL, _("Extract All Files..."));
|
||||
|
||||
PopupMenu(&popupMenu);
|
||||
PopupMenu(popupMenu);
|
||||
|
||||
event.Skip();
|
||||
}
|
||||
|
Reference in New Issue
Block a user