From bfe6e92c15ea4ebd25070d1a95f0eca380f2c92b Mon Sep 17 00:00:00 2001
From: donkopunchstania <donkopunchstania@gmail.com>
Date: Wed, 14 Apr 2010 03:26:18 +0000
Subject: [PATCH] Return a string instead of a wxChar pointer.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5360 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/Frame.h        | 2 +-
 Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 307764a840..7eb36691e4 100644
--- 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();
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 43460f858d..96f243e7cb 100644
--- 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)