diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index cee65f414f..6d45e9a8c3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -138,7 +138,8 @@ IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID) if (g_DeviceMap.find(_ID) != g_DeviceMap.end()) return g_DeviceMap[_ID]; - _dbg_assert_msg_(WII_IPC, 0, "IOP tries to access an unknown device 0x%x", _ID); + // ID = 0 just means it hasn't been created yet + _dbg_assert_msg_(WII_IPC, _ID == 0, "IOP tries to access an unknown device 0x%x", _ID); return NULL; } diff --git a/Source/Core/DebuggerUICommon/Src/CodeView.cpp b/Source/Core/DebuggerUICommon/Src/CodeView.cpp index 830ec13fa8..9ec4bf5d0c 100644 --- a/Source/Core/DebuggerUICommon/Src/CodeView.cpp +++ b/Source/Core/DebuggerUICommon/Src/CodeView.cpp @@ -348,26 +348,26 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event) { bool isSymbol = symbol_db->GetSymbolFromAddr(selection) != 0; // popup menu - wxMenu menu; - //menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view"); - menu.Append(IDM_FOLLOWBRANCH, wxString::FromAscii("&Follow branch"))->Enable(AddrToBranch(selection) ? true : false); - menu.AppendSeparator(); + wxMenu* menu = new wxMenu; + //menu->Append(IDM_GOTOINMEMVIEW, "&Goto in mem view"); + menu->Append(IDM_FOLLOWBRANCH, wxString::FromAscii("&Follow branch"))->Enable(AddrToBranch(selection) ? true : false); + menu->AppendSeparator(); #if wxUSE_CLIPBOARD - menu.Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address")); - menu.Append(IDM_COPYFUNCTION, wxString::FromAscii("Copy &function"))->Enable(isSymbol); - menu.Append(IDM_COPYCODE, wxString::FromAscii("Copy &code line")); - menu.Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex")); - menu.AppendSeparator(); + menu->Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address")); + menu->Append(IDM_COPYFUNCTION, wxString::FromAscii("Copy &function"))->Enable(isSymbol); + menu->Append(IDM_COPYCODE, wxString::FromAscii("Copy &code line")); + menu->Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex")); + menu->AppendSeparator(); #endif - menu.Append(IDM_RENAMESYMBOL, wxString::FromAscii("Rename &symbol"))->Enable(isSymbol); - menu.AppendSeparator(); - menu.Append(IDM_RUNTOHERE, _T("&Run To Here")); - menu.Append(IDM_ADDFUNCTION, _T("&Add function")); - menu.Append(IDM_JITRESULTS, wxString::FromAscii("PPC vs X86")); - menu.Append(IDM_INSERTBLR, wxString::FromAscii("Insert &blr")); - menu.Append(IDM_INSERTNOP, wxString::FromAscii("Insert &nop")); - menu.Append(IDM_PATCHALERT, wxString::FromAscii("Patch alert")); - PopupMenu(&menu); + menu->Append(IDM_RENAMESYMBOL, wxString::FromAscii("Rename &symbol"))->Enable(isSymbol); + menu->AppendSeparator(); + menu->Append(IDM_RUNTOHERE, _T("&Run To Here")); + menu->Append(IDM_ADDFUNCTION, _T("&Add function")); + menu->Append(IDM_JITRESULTS, wxString::FromAscii("PPC vs X86")); + menu->Append(IDM_INSERTBLR, wxString::FromAscii("Insert &blr")); + menu->Append(IDM_INSERTNOP, wxString::FromAscii("Insert &nop")); + menu->Append(IDM_PATCHALERT, wxString::FromAscii("Patch alert")); + PopupMenu(menu); event.Skip(true); } diff --git a/Source/Core/DebuggerUICommon/Src/MemoryView.cpp b/Source/Core/DebuggerUICommon/Src/MemoryView.cpp index 5648207daa..c699ba7afc 100644 --- a/Source/Core/DebuggerUICommon/Src/MemoryView.cpp +++ b/Source/Core/DebuggerUICommon/Src/MemoryView.cpp @@ -227,20 +227,20 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event) void CMemoryView::OnMouseDownR(wxMouseEvent& event) { // popup menu - wxMenu menu; + wxMenu* menu = new wxMenu; //menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view"); #if wxUSE_CLIPBOARD - menu.Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address")); - menu.Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex")); + menu->Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address")); + menu->Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex")); #endif - menu.Append(IDM_TOGGLEMEMORY, wxString::FromAscii("Toggle &memory (RAM/ARAM)")); + menu->Append(IDM_TOGGLEMEMORY, wxString::FromAscii("Toggle &memory (RAM/ARAM)")); - wxMenu viewAsSubMenu; - viewAsSubMenu.Append(IDM_VIEWASFP, wxString::FromAscii("FP value")); - viewAsSubMenu.Append(IDM_VIEWASASCII, wxString::FromAscii("ASCII")); - menu.AppendSubMenu(&viewAsSubMenu, wxString::FromAscii("View As:")); + wxMenu* viewAsSubMenu = new wxMenu; + viewAsSubMenu->Append(IDM_VIEWASFP, wxString::FromAscii("FP value")); + viewAsSubMenu->Append(IDM_VIEWASASCII, wxString::FromAscii("ASCII")); + menu->AppendSubMenu(viewAsSubMenu, wxString::FromAscii("View As:")); - PopupMenu(&menu); + PopupMenu(menu); event.Skip(true); } diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 1d6c9e7746..1fa3b57465 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -164,7 +164,7 @@ CNANDContentLoader::CNANDContentLoader(const std::string& _rName) } else { - _dbg_assert_msg_(BOOT, 0, "CNANDContentLoader loads neither folder nor file"); +// _dbg_assert_msg_(BOOT, 0, "CNANDContentLoader loads neither folder nor file"); } } diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp index 9ecd24471f..789b9d1bc9 100644 --- a/Source/Core/DolphinWX/Src/FrameAui.cpp +++ b/Source/Core/DolphinWX/Src/FrameAui.cpp @@ -277,40 +277,40 @@ void CFrame::OnTab(wxAuiNotebookEvent& event) if (!g_pCodeWindow) return; // Create the popup menu - wxMenu MenuPopup; + wxMenu* MenuPopup = new wxMenu; - wxMenuItem* Item = new wxMenuItem(&MenuPopup, wxID_ANY, wxT("Select floating windows")); - MenuPopup.Append(Item); + wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, wxT("Select floating windows")); + MenuPopup->Append(Item); Item->Enable(false); - MenuPopup.Append(new wxMenuItem(&MenuPopup)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_LOGWINDOW, WindowNameFromId(IDM_LOGWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + MenuPopup->Append(new wxMenuItem(MenuPopup)); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_LOGWINDOW, WindowNameFromId(IDM_LOGWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_LOGWINDOW_PARENT)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_CONSOLEWINDOW, WindowNameFromId(IDM_CONSOLEWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_CONSOLEWINDOW, WindowNameFromId(IDM_CONSOLEWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_CONSOLEWINDOW_PARENT)); - MenuPopup.Append(new wxMenuItem(&MenuPopup)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_CODEWINDOW, WindowNameFromId(IDM_CODEWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + MenuPopup->Append(new wxMenuItem(MenuPopup)); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_CODEWINDOW, WindowNameFromId(IDM_CODEWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_CODEWINDOW_PARENT)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_REGISTERWINDOW, WindowNameFromId(IDM_REGISTERWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_REGISTERWINDOW, WindowNameFromId(IDM_REGISTERWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_REGISTERWINDOW_PARENT)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_BREAKPOINTWINDOW, WindowNameFromId(IDM_BREAKPOINTWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_BREAKPOINTWINDOW, WindowNameFromId(IDM_BREAKPOINTWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_BREAKPOINTWINDOW_PARENT)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_MEMORYWINDOW, WindowNameFromId(IDM_MEMORYWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_MEMORYWINDOW, WindowNameFromId(IDM_MEMORYWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_MEMORYWINDOW_PARENT)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_JITWINDOW, WindowNameFromId(IDM_JITWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_JITWINDOW, WindowNameFromId(IDM_JITWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_JITWINDOW_PARENT)); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_SOUNDWINDOW, WindowNameFromId(IDM_SOUNDWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_SOUNDWINDOW, WindowNameFromId(IDM_SOUNDWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_SOUNDWINDOW_PARENT)); Item->Enable(false); - Item = new wxMenuItem(&MenuPopup, IDM_FLOAT_VIDEOWINDOW, WindowNameFromId(IDM_VIDEOWINDOW), wxT(""), wxITEM_CHECK); - MenuPopup.Append(Item); + Item = new wxMenuItem(MenuPopup, IDM_FLOAT_VIDEOWINDOW, WindowNameFromId(IDM_VIDEOWINDOW), wxT(""), wxITEM_CHECK); + MenuPopup->Append(Item); Item->Check(!!FindWindowById(IDM_VIDEOWINDOW_PARENT)); Item->Enable(false); @@ -318,7 +318,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event) wxPoint Pt = ::wxGetMousePosition(); Pt = ScreenToClient(Pt); // Show - PopupMenu(&MenuPopup, Pt); + PopupMenu(MenuPopup, Pt); } void CFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& event) { @@ -513,16 +513,16 @@ void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event) Tb->SetToolSticky(event.GetId(), true); // Create the popup menu - wxMenu menuPopup; + wxMenu* menuPopup = new wxMenu; - wxMenuItem* Item = new wxMenuItem(&menuPopup, IDM_PERSPECTIVES_ADD_PANE, wxT("Add new pane")); - menuPopup.Append(Item); - menuPopup.Append(new wxMenuItem(&menuPopup)); - Item = new wxMenuItem(&menuPopup, IDM_TAB_SPLIT, wxT("Tab split"), wxT(""), wxITEM_CHECK); - menuPopup.Append(Item); + wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_PERSPECTIVES_ADD_PANE, wxT("Add new pane")); + menuPopup->Append(Item); + menuPopup->Append(new wxMenuItem(menuPopup)); + Item = new wxMenuItem(menuPopup, IDM_TAB_SPLIT, wxT("Tab split"), wxT(""), wxITEM_CHECK); + menuPopup->Append(Item); Item->Check(m_bTabSplit); - Item = new wxMenuItem(&menuPopup, IDM_NO_DOCKING, wxT("No docking"), wxT(""), wxITEM_CHECK); - menuPopup.Append(Item); + Item = new wxMenuItem(menuPopup, IDM_NO_DOCKING, wxT("No docking"), wxT(""), wxITEM_CHECK); + menuPopup->Append(Item); Item->Check(m_bNoDocking); // Line up our menu with the button @@ -530,7 +530,7 @@ void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event) wxPoint Pt = Tb->ClientToScreen(rect.GetBottomLeft()); Pt = ScreenToClient(Pt); // Show - PopupMenu(&menuPopup, Pt); + PopupMenu(menuPopup, Pt); // Make the button un-stuck again if (!m_bEdit) Tb->SetToolSticky(event.GetId(), false); } @@ -546,17 +546,17 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event) tb->SetToolSticky(event.GetId(), true); // create the popup menu - wxMenu menuPopup; - wxMenuItem* Item = new wxMenuItem(&menuPopup, IDM_ADD_PERSPECTIVE, wxT("Create new perspective")); - menuPopup.Append(Item); + wxMenu* menuPopup = new wxMenu; + wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_ADD_PERSPECTIVE, wxT("Create new perspective")); + menuPopup->Append(Item); if (Perspectives.size() > 0) { - menuPopup.Append(new wxMenuItem(&menuPopup)); + menuPopup->Append(new wxMenuItem(menuPopup)); for (u32 i = 0; i < Perspectives.size(); i++) { - wxMenuItem* mItem = new wxMenuItem(&menuPopup, IDM_PERSPECTIVES_0 + i, wxString::FromAscii(Perspectives.at(i).Name.c_str()), wxT(""), wxITEM_CHECK); - menuPopup.Append(mItem); + wxMenuItem* mItem = new wxMenuItem(menuPopup, IDM_PERSPECTIVES_0 + i, wxString::FromAscii(Perspectives.at(i).Name.c_str()), wxT(""), wxITEM_CHECK); + menuPopup->Append(mItem); if (i == ActivePerspective) mItem->Check(true); } } @@ -566,7 +566,7 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event) wxPoint pt = tb->ClientToScreen(rect.GetBottomLeft()); pt = ScreenToClient(pt); // show - PopupMenu(&menuPopup, pt); + PopupMenu(menuPopup, pt); // make sure the button is "un-stuck" tb->SetToolSticky(event.GetId(), false); } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index d88652b26f..a21fa8c394 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -785,44 +785,44 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event) const GameListItem *selected_iso = GetSelectedISO(); if (selected_iso) { - wxMenu popupMenu; - popupMenu.Append(IDM_PROPERTIES, _("&Properties")); - popupMenu.AppendSeparator(); + wxMenu* popupMenu = new wxMenu; + popupMenu->Append(IDM_PROPERTIES, _("&Properties")); + popupMenu->AppendSeparator(); if (selected_iso->GetPlatform() != GameListItem::GAMECUBE_DISC) - popupMenu.Append(IDM_OPENSAVEFOLDER, _("Open Wii &save folder")); + popupMenu->Append(IDM_OPENSAVEFOLDER, _("Open Wii &save folder")); - popupMenu.Append(IDM_OPENCONTAININGFOLDER, _("Open &containing folder")); - popupMenu.AppendCheckItem(IDM_SETDEFAULTGCM, _("Set as &default ISO")); + popupMenu->Append(IDM_OPENCONTAININGFOLDER, _("Open &containing folder")); + popupMenu->AppendCheckItem(IDM_SETDEFAULTGCM, _("Set as &default ISO")); // First we have to decide a starting value when we append it if(selected_iso->GetFileName() == SConfig::GetInstance(). m_LocalCoreStartupParameter.m_strDefaultGCM) - popupMenu.FindItem(IDM_SETDEFAULTGCM)->Check(); + popupMenu->FindItem(IDM_SETDEFAULTGCM)->Check(); - popupMenu.AppendSeparator(); - popupMenu.Append(IDM_DELETEGCM, _("&Delete ISO...")); + popupMenu->AppendSeparator(); + popupMenu->Append(IDM_DELETEGCM, _("&Delete ISO...")); if (selected_iso->GetPlatform() != GameListItem::WII_WAD) { if (selected_iso->IsCompressed()) - popupMenu.Append(IDM_COMPRESSGCM, _("Decompress ISO...")); + popupMenu->Append(IDM_COMPRESSGCM, _("Decompress ISO...")); else - popupMenu.Append(IDM_COMPRESSGCM, _("Compress ISO...")); + popupMenu->Append(IDM_COMPRESSGCM, _("Compress ISO...")); } else - popupMenu.Append(IDM_INSTALLWAD, _("Install to Wii Menu")); + popupMenu->Append(IDM_INSTALLWAD, _("Install to Wii Menu")); - PopupMenu(&popupMenu); + PopupMenu(popupMenu); } } else if (GetSelectedItemCount() > 1) { - wxMenu popupMenu; - popupMenu.Append(IDM_DELETEGCM, _("&Delete selected ISOs...")); - popupMenu.AppendSeparator(); - popupMenu.Append(IDM_MULTICOMPRESSGCM, _("Compress selected ISOs...")); - popupMenu.Append(IDM_MULTIDECOMPRESSGCM, _("Decompress selected ISOs...")); - PopupMenu(&popupMenu); + wxMenu* popupMenu = new wxMenu; + popupMenu->Append(IDM_DELETEGCM, _("&Delete selected ISOs...")); + popupMenu->AppendSeparator(); + popupMenu->Append(IDM_MULTICOMPRESSGCM, _("Compress selected ISOs...")); + popupMenu->Append(IDM_MULTIDECOMPRESSGCM, _("Decompress selected ISOs...")); + PopupMenu(popupMenu); } } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 364a000336..fcf908db3e 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -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(); } diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 80b3c384a2..61058cdf06 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -883,7 +883,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) int flags; long item = HitTest(event.GetPosition(), flags); - wxMenu popupMenu; + wxMenu* popupMenu = new wxMenu; if (item != wxNOT_FOUND) { @@ -894,47 +894,47 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); int slot = event.GetId() - ID_MEMCARDLIST_A; - popupMenu.Append(ID_COPYFROM_A + slot, wxString::Format(wxT("Copy to Memcard %c"), 'B' - slot)); - popupMenu.Append(ID_DELETE_A + slot, wxT("Delete Save")); - popupMenu.Append(ID_SAVEIMPORT_A + slot, wxT("Import Save")); - popupMenu.Append(ID_SAVEEXPORT_A + slot, wxT("Export Save")); - popupMenu.Append(ID_EXPORTALL_A + slot, wxT("Export all saves")); + popupMenu->Append(ID_COPYFROM_A + slot, wxString::Format(wxT("Copy to Memcard %c"), 'B' - slot)); + popupMenu->Append(ID_DELETE_A + slot, wxT("Delete Save")); + popupMenu->Append(ID_SAVEIMPORT_A + slot, wxT("Import Save")); + popupMenu->Append(ID_SAVEEXPORT_A + slot, wxT("Export Save")); + popupMenu->Append(ID_EXPORTALL_A + slot, wxT("Export all saves")); if (!twoCardsLoaded) - popupMenu.FindItem(ID_COPYFROM_A + slot)->Enable(false); + popupMenu->FindItem(ID_COPYFROM_A + slot)->Enable(false); - popupMenu.AppendSeparator(); + popupMenu->AppendSeparator(); - popupMenu.Append(ID_FIXCHECKSUM_A + slot, wxT("Fix Checksums")); - popupMenu.Append(ID_PREVPAGE_A + slot, wxT("Previous Page")); - popupMenu.Append(ID_NEXTPAGE_A + slot, wxT("Next Page")); - popupMenu.Append(ID_MEMCARDPATH_A + slot, wxString::Format(wxT("Set as default Memcard %c"), 'A' + slot)); - popupMenu.AppendCheckItem(ID_USEPAGES, wxT("Enable pages")); + popupMenu->Append(ID_FIXCHECKSUM_A + slot, wxT("Fix Checksums")); + popupMenu->Append(ID_PREVPAGE_A + slot, wxT("Previous Page")); + popupMenu->Append(ID_NEXTPAGE_A + slot, wxT("Next Page")); + popupMenu->Append(ID_MEMCARDPATH_A + slot, wxString::Format(wxT("Set as default Memcard %c"), 'A' + slot)); + popupMenu->AppendCheckItem(ID_USEPAGES, wxT("Enable pages")); if (!prevPage || !usePages) - popupMenu.FindItem(ID_PREVPAGE_A + slot)->Enable(false); + popupMenu->FindItem(ID_PREVPAGE_A + slot)->Enable(false); if (!nextPage || !usePages) - popupMenu.FindItem(ID_NEXTPAGE_A + slot)->Enable(false); + popupMenu->FindItem(ID_NEXTPAGE_A + slot)->Enable(false); if(usePages) - popupMenu.FindItem(ID_USEPAGES)->Check(); + popupMenu->FindItem(ID_USEPAGES)->Check(); - popupMenu.AppendSeparator(); + popupMenu->AppendSeparator(); - popupMenu.AppendCheckItem(COLUMN_BANNER, wxT("Show save banner")); - popupMenu.AppendCheckItem(COLUMN_TITLE, wxT("Show save title")); - popupMenu.AppendCheckItem(COLUMN_COMMENT, wxT("Show save comment")); - popupMenu.AppendCheckItem(COLUMN_ICON, wxT("Show save icon")); - popupMenu.AppendCheckItem(COLUMN_BLOCKS, wxT("Show save blocks")); + popupMenu->AppendCheckItem(COLUMN_BANNER, wxT("Show save banner")); + popupMenu->AppendCheckItem(COLUMN_TITLE, wxT("Show save title")); + popupMenu->AppendCheckItem(COLUMN_COMMENT, wxT("Show save comment")); + popupMenu->AppendCheckItem(COLUMN_ICON, wxT("Show save icon")); + popupMenu->AppendCheckItem(COLUMN_BLOCKS, wxT("Show save blocks")); for (int i = COLUMN_BANNER; i <= COLUMN_BLOCKS; i++) { - if (column[i]) popupMenu.FindItem(i)->Check(); + if (column[i]) popupMenu->FindItem(i)->Check(); } #ifdef DEBUG_MCM - popupMenu.AppendCheckItem(NUMBER_OF_COLUMN, wxT("Debug Memcard")); - if (column[NUMBER_OF_COLUMN]) popupMenu.FindItem(NUMBER_OF_COLUMN)->Check(); + popupMenu->AppendCheckItem(NUMBER_OF_COLUMN, wxT("Debug Memcard")); + if (column[NUMBER_OF_COLUMN]) popupMenu->FindItem(NUMBER_OF_COLUMN)->Check(); #endif } - PopupMenu(&popupMenu); + PopupMenu(popupMenu); }