Return a string instead of a wxChar pointer.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5360 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-14 03:26:18 +00:00 · 2010-04-14 03:26:18 +00:00 · bfe6e92c15
parent 387aba7a6c
commit bfe6e92c15
2 changed files with 2 additions and 2 deletions
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@ -145,7 +145,7 @@ class CFrame : public wxFrame
 		int PixelsToPercentage(int,int);
 		void ListChildren();
 		void ListTopWindows();
-		const wxChar * GetMenuLabel(int Id);
+		wxString GetMenuLabel(int Id);

 		// Perspectives
 		void AddRemoveBlankPage();
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@ -270,7 +270,7 @@ void CFrame::CreateMenu()
 	SetMenuBar(m_MenuBar);
 }

-const wxChar * CFrame::GetMenuLabel(int Id)
+wxString CFrame::GetMenuLabel(int Id)
 {
 	wxString Label;
 	switch (Id)