mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-28 16:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wxCmdLineEntryDesc has switched to char string in 2.9.

Browse Source 
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
This commit is contained in:
Soren Jorvang 2011-01-12 01:03:49 +00:00
parent 493d92eb25
commit 78ec771063
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Src/ConfigManager.cpp
View File

@ -31,10 +31,14 @@ static const struct {
const int DefaultKey; const int DefaultKey;
const int DefaultModifier; const int DefaultModifier;
} g_HKData[] = { } g_HKData[] = {
{ "ToggleFullscreen", 13 /* WXK_RETURN */, 0x0001 /* wxMOD_ALT */ }, #ifdef __APPLE__
{ "PlayPause", 349 /* WXK_F10 */, 0x0000 /* wxMOD_NONE */ }, { "ToggleFullscreen", 70 /* 'F' */, 0x0008 /* wxMOD_CMD */ },
{ "Stop", 27 /* WXK_ESCAPE */, 0x0000 /* wxMOD_NONE */ }, #else
{ "Screenshot", 348 /* WXK_F9 */, 0x0000 /* wxMOD_NONE */ }, { "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 */ }, { "Wiimote1Connect", 344 /* WXK_F5 */, 0x0001 /* wxMOD_ALT */ },
{ "Wiimote2Connect", 345 /* WXK_F6 */, 0x0001 /* wxMOD_ALT */ }, { "Wiimote2Connect", 345 /* WXK_F6 */, 0x0001 /* wxMOD_ALT */ },
{ "Wiimote3Connect", 346 /* WXK_F7 */, 0x0001 /* wxMOD_ALT */ }, { "Wiimote3Connect", 346 /* WXK_F7 */, 0x0001 /* wxMOD_ALT */ },

28
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -107,34 +107,34 @@ bool DolphinApp::OnInit()
wxCmdLineEntryDesc cmdLineDesc[] = wxCmdLineEntryDesc cmdLineDesc[] =
{ {
{ {
wxCMD_LINE_SWITCH, _("h"), _("help"), wxCMD_LINE_SWITCH, wxS("h"), wxS("help"),
_("Show this help message"), _("Show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
}, },
{ {
wxCMD_LINE_SWITCH, _("d"), _("debugger"), wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"),
_("Opens the debugger") _("Opens the debugger")
}, },
{ {
wxCMD_LINE_SWITCH, _("l"), _("logger"), wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"),
_("Opens the 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)"), _("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
}, },
{ {
wxCMD_LINE_SWITCH, _("b"), _("batch"), wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"),
_("Exit Dolphin with emulator") _("Exit Dolphin with emulator")
}, },
{ {
wxCMD_LINE_OPTION, _("V"), _("video_plugin"), wxCMD_LINE_OPTION, wxS("V"), wxS("video_plugin"),
_("Specify a video plugin"), _("Specify a video plugin"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL 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"), _("Specify an audio plugin"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
}, },
@ -150,12 +150,14 @@ bool DolphinApp::OnInit()
return false; return false;
} }
UseDebugger = parser.Found(_T("debugger")); UseDebugger = parser.Found(wxT("debugger"));
UseLogger = parser.Found(_T("logger")); UseLogger = parser.Found(wxT("logger"));
LoadFile = parser.Found(_T("exec"), &FileToLoad); LoadFile = parser.Found(wxT("exec"), &FileToLoad);
BatchMode = parser.Found(_T("batch")); BatchMode = parser.Found(wxT("batch"));
selectVideoPlugin = parser.Found(_T("video_plugin"), &videoPluginFilename); selectVideoPlugin = parser.Found(wxT("video_plugin"),
selectAudioPlugin = parser.Found(_T("audio_plugin"), &audioPluginFilename); &videoPluginFilename);
selectAudioPlugin = parser.Found(wxT("audio_plugin"),
&audioPluginFilename);
#endif // wxUSE_CMDLINE_PARSER #endif // wxUSE_CMDLINE_PARSER
#if defined _DEBUG && defined _WIN32 #if defined _DEBUG && defined _WIN32