From 78ec77106373407720d3fdfde5627e1a43681796 Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Wed, 12 Jan 2011 01:03:49 +0000
Subject: [PATCH] wxCmdLineEntryDesc has switched to char string in 2.9. Use
 wxS to get the right string type on either 2.8 or 2.9.

Default to cmd-f for the fullscreen toggle hotkey on OS X.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6820 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/ConfigManager.cpp | 12 +++++++----
 Source/Core/DolphinWX/Src/Main.cpp     | 28 ++++++++++++++------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index 6b30411809..c180ab4f16 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -31,10 +31,14 @@ static const struct {
 	const int DefaultKey;
 	const int DefaultModifier;
 } g_HKData[] = {
-	{ "ToggleFullscreen",	13 /* WXK_RETURN */,	0x0001 /* wxMOD_ALT */ },
-	{ "PlayPause",		 	349 /* WXK_F10 */,		0x0000 /* wxMOD_NONE */ },
-	{ "Stop",			 	27 /* WXK_ESCAPE */,	0x0000 /* wxMOD_NONE */ },
-	{ "Screenshot",		 	348 /* WXK_F9 */,		0x0000 /* wxMOD_NONE */ },
+#ifdef __APPLE__
+	{ "ToggleFullscreen",	 70 /* 'F' */,			0x0008 /* wxMOD_CMD */ },
+#else
+	{ "ToggleFullscreen",	 13 /* WXK_RETURN */,		0x0001 /* wxMOD_ALT */ },
+#endif
+	{ "PlayPause",		349 /* WXK_F10 */,		0x0000 /* wxMOD_NONE */ },
+	{ "Stop",		 27 /* WXK_ESCAPE */,		0x0000 /* wxMOD_NONE */ },
+	{ "Screenshot",		348 /* WXK_F9 */,		0x0000 /* wxMOD_NONE */ },
 	{ "Wiimote1Connect", 	344 /* WXK_F5 */,		0x0001 /* wxMOD_ALT */ },
 	{ "Wiimote2Connect", 	345 /* WXK_F6 */,		0x0001 /* wxMOD_ALT */ },
 	{ "Wiimote3Connect", 	346 /* WXK_F7 */,		0x0001 /* wxMOD_ALT */ },
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index d5fa060e59..a1339198a1 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -107,34 +107,34 @@ bool DolphinApp::OnInit()
 	wxCmdLineEntryDesc cmdLineDesc[] =
 	{
 		{
-			wxCMD_LINE_SWITCH, _("h"), _("help"),
+			wxCMD_LINE_SWITCH, wxS("h"), wxS("help"),
 			_("Show this help message"),
 			wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
 		},
 		{
-			wxCMD_LINE_SWITCH, _("d"), _("debugger"),
+			wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"),
 			_("Opens the debugger")
 		},
 		{
-			wxCMD_LINE_SWITCH, _("l"), _("logger"),
+			wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"),
 			_("Opens the logger")
 		},
 		{
-			wxCMD_LINE_OPTION, _("e"), _("exec"),
+			wxCMD_LINE_OPTION, wxS("e"), wxS("exec"),
 			_("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
 		{
-			wxCMD_LINE_SWITCH, _("b"), _("batch"),
+			wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"),
 			_("Exit Dolphin with emulator")
 		},
 		{
-			wxCMD_LINE_OPTION, _("V"), _("video_plugin"),
+			wxCMD_LINE_OPTION, wxS("V"), wxS("video_plugin"),
 			_("Specify a video plugin"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
 		{
-			wxCMD_LINE_OPTION, _("A"), _("audio_plugin"),
+			wxCMD_LINE_OPTION, wxS("A"), wxS("audio_plugin"),
 			_("Specify an audio plugin"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
@@ -150,12 +150,14 @@ bool DolphinApp::OnInit()
 		return false;
 	} 
 
-	UseDebugger = parser.Found(_T("debugger"));
-	UseLogger = parser.Found(_T("logger"));
-	LoadFile = parser.Found(_T("exec"), &FileToLoad);
-	BatchMode = parser.Found(_T("batch"));
-	selectVideoPlugin = parser.Found(_T("video_plugin"), &videoPluginFilename);
-	selectAudioPlugin = parser.Found(_T("audio_plugin"), &audioPluginFilename);
+	UseDebugger = parser.Found(wxT("debugger"));
+	UseLogger = parser.Found(wxT("logger"));
+	LoadFile = parser.Found(wxT("exec"), &FileToLoad);
+	BatchMode = parser.Found(wxT("batch"));
+	selectVideoPlugin = parser.Found(wxT("video_plugin"),
+		&videoPluginFilename);
+	selectAudioPlugin = parser.Found(wxT("audio_plugin"),
+		&audioPluginFilename);
 #endif // wxUSE_CMDLINE_PARSER
 
 #if defined _DEBUG && defined _WIN32