diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-20 11:02:41 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-20 11:02:41 +0000 |
| commit | c7795c41b7f44bed9e6c1dbab40edebfe8566ded (patch) | |
| tree | c22daf09bb367e78062cddd4a806f85aaa6e83a9 /Source/Core/DebuggerWX/src/CodeView.cpp | |
| parent | 35950043a663ac0e07666a44955de526fb1ee8c6 (diff) | |
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
Diffstat (limited to 'Source/Core/DebuggerWX/src/CodeView.cpp')
| -rw-r--r-- | Source/Core/DebuggerWX/src/CodeView.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DebuggerWX/src/CodeView.cpp b/Source/Core/DebuggerWX/src/CodeView.cpp index 646a1b3543..dad9bb7360 100644 --- a/Source/Core/DebuggerWX/src/CodeView.cpp +++ b/Source/Core/DebuggerWX/src/CodeView.cpp @@ -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");
|