mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-30 05:48:03 +03:00
Linux: Fix ups for people running Linux. If it breaks anything, punch me in the face.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@30 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
35950043a6
commit
c7795c41b7
36 changed files with 140 additions and 72 deletions
|
@ -163,14 +163,14 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
|
|||
break;
|
||||
|
||||
case IDM_COPYCODE:
|
||||
wxTheClipboard->SetData(new wxTextDataObject(debugger->disasm(selection)));
|
||||
wxTheClipboard->SetData(new wxTextDataObject(wxString::FromAscii(debugger->disasm(selection)))); //Have to manually convert from char* to wxString, don't have to in Windows?
|
||||
break;
|
||||
|
||||
case IDM_COPYHEX:
|
||||
{
|
||||
char temp[24];
|
||||
sprintf(temp, "%08x", debugger->readMemory(selection));
|
||||
wxTheClipboard->SetData(new wxTextDataObject(temp));
|
||||
wxTheClipboard->SetData(new wxTextDataObject(wxString::FromAscii(temp)));
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
|
@ -205,9 +205,9 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event)
|
|||
wxMenu menu;
|
||||
//menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
|
||||
#if wxUSE_CLIPBOARD
|
||||
menu.Append(IDM_COPYADDRESS, "Copy &address");
|
||||
menu.Append(IDM_COPYCODE, "Copy &code");
|
||||
menu.Append(IDM_COPYHEX, "Copy &hex");
|
||||
menu.Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address"));
|
||||
menu.Append(IDM_COPYCODE, wxString::FromAscii("Copy &code"));
|
||||
menu.Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex"));
|
||||
#endif
|
||||
menu.Append(IDM_RUNTOHERE, _T("&Run To Here"));
|
||||
//menu.Append(IDM_DYNARECRESULTS, "Copy &address");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue