summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/src/GameListCtrl.cpp
diff options
context:
space:
mode:
authorSonicadvance1 <sonicadvance1@gmail.com>2008-07-21 01:27:13 +0000
committerSonicadvance1 <sonicadvance1@gmail.com>2008-07-21 01:27:13 +0000
commitc33cf08a2f059069c08fc02bc41fa57a2bea942f (patch)
tree2115da671c23acdd769f5220102ddac28fba1dbc /Source/Core/DolphinWX/src/GameListCtrl.cpp
parent36f8b9751a5de8548e6ed1f0d62035dd5f54a761 (diff)
Linux: Fixes a few things, Should Compile in Linux. Ran Crazy Taxi horribly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@38 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/src/GameListCtrl.cpp')
-rw-r--r--Source/Core/DolphinWX/src/GameListCtrl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/src/GameListCtrl.cpp b/Source/Core/DolphinWX/src/GameListCtrl.cpp
index 513e7a95a2..17391926a4 100644
--- a/Source/Core/DolphinWX/src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/src/GameListCtrl.cpp
@@ -338,8 +338,8 @@ CGameListCtrl::OnRightClick(wxMouseEvent& event)
std::string unique_id = selected_iso->GetUniqueID();
wxMenu popupMenu;
std::string menu_text = StringFromFormat("Edit &patch file: %s.ini", unique_id.c_str());
- popupMenu.Append(IDM_EDITPATCHFILE, menu_text);
- popupMenu.Append(IDM_OPENCONTAININGFOLDER, "Open &containing folder");
+ popupMenu.Append(IDM_EDITPATCHFILE, wxString::FromAscii(menu_text.c_str())); //Pretty much everything in wxwidgets is a wxString, try to convert to those first!
+ popupMenu.Append(IDM_OPENCONTAININGFOLDER, wxString::FromAscii("Open &containing folder"));
PopupMenu(&popupMenu);
}
}