piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Kill off _T and wxT macros

Browse Source 
Minor other alterations that relate to above as well.

Also added the PanicAlertT version of alerts for some error messages that
use PanicAlert. We want the user to actually understand why the error
occurred.
This commit is contained in:
Lioncash
2014-05-17 13:17:28 -04:00
parent 90df5efd01
commit e1359382be
41 changed files with 397 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
Source/Core/DolphinWX/WXInputBase.cpp
View File

@ -33,8 +33,8 @@ const wxString WXKeyToString(int keycode)
case WXK_CANCEL: return _("Cancel");
case WXK_MBUTTON: return _("M Button");
case WXK_CLEAR: return _("Clear");
case WXK_SHIFT: return wxT("Shift");
case WXK_ALT: return wxT("Alt");
case WXK_SHIFT: return "Shift";
case WXK_ALT: return "Alt";
case WXK_RAW_CONTROL: return _("Control");
#ifdef __WXOSX__
case WXK_COMMAND: return _("Command");
@ -54,46 +54,46 @@ const wxString WXKeyToString(int keycode)
case WXK_SNAPSHOT: return _("Snapshot");
case WXK_INSERT: return _("Insert");
case WXK_HELP: return _("Help");
case WXK_NUMPAD0: return wxT("NP 0");
case WXK_NUMPAD1: return wxT("NP 1");
case WXK_NUMPAD2: return wxT("NP 2");
case WXK_NUMPAD3: return wxT("NP 3");
case WXK_NUMPAD4: return wxT("NP 4");
case WXK_NUMPAD5: return wxT("NP 5");
case WXK_NUMPAD6: return wxT("NP 6");
case WXK_NUMPAD7: return wxT("NP 7");
case WXK_NUMPAD8: return wxT("NP 8");
case WXK_NUMPAD9: return wxT("NP 9");
case WXK_NUMPAD0: return "NP 0";
case WXK_NUMPAD1: return "NP 1";
case WXK_NUMPAD2: return "NP 2";
case WXK_NUMPAD3: return "NP 3";
case WXK_NUMPAD4: return "NP 4";
case WXK_NUMPAD5: return "NP 5";
case WXK_NUMPAD6: return "NP 6";
case WXK_NUMPAD7: return "NP 7";
case WXK_NUMPAD8: return "NP 8";
case WXK_NUMPAD9: return "NP 9";
case WXK_MULTIPLY: return _("Multiply");
case WXK_ADD: return _("Add");
case WXK_SEPARATOR: return _("Separator");
case WXK_SUBTRACT: return _("Subtract");
case WXK_DECIMAL: return _("Decimal");
case WXK_DIVIDE: return _("Divide");
case WXK_F1: return wxT("F1");
case WXK_F2: return wxT("F2");
case WXK_F3: return wxT("F3");
case WXK_F4: return wxT("F4");
case WXK_F5: return wxT("F5");
case WXK_F6: return wxT("F6");
case WXK_F7: return wxT("F7");
case WXK_F8: return wxT("F8");
case WXK_F9: return wxT("F9");
case WXK_F10: return wxT("F10");
case WXK_F11: return wxT("F11");
case WXK_F12: return wxT("F12");
case WXK_F13: return wxT("F13");
case WXK_F14: return wxT("F14");
case WXK_F15: return wxT("F15");
case WXK_F16: return wxT("F16");
case WXK_F17: return wxT("F17");
case WXK_F18: return wxT("F19");
case WXK_F19: return wxT("F20");
case WXK_F20: return wxT("F21");
case WXK_F21: return wxT("F22");
case WXK_F22: return wxT("F23");
case WXK_F23: return wxT("F24");
case WXK_F24: return wxT("F25");
case WXK_F1: return "F1";
case WXK_F2: return "F2";
case WXK_F3: return "F3";
case WXK_F4: return "F4";
case WXK_F5: return "F5";
case WXK_F6: return "F6";
case WXK_F7: return "F7";
case WXK_F8: return "F8";
case WXK_F9: return "F9";
case WXK_F10: return "F10";
case WXK_F11: return "F11";
case WXK_F12: return "F12";
case WXK_F13: return "F13";
case WXK_F14: return "F14";
case WXK_F15: return "F15";
case WXK_F16: return "F16";
case WXK_F17: return "F17";
case WXK_F18: return "F19";
case WXK_F19: return "F20";
case WXK_F20: return "F21";
case WXK_F21: return "F22";
case WXK_F22: return "F23";
case WXK_F23: return "F24";
case WXK_F24: return "F25";
case WXK_NUMLOCK: return _("Num Lock");
case WXK_SCROLL: return _("Scroll Lock");
case WXK_PAGEUP: return _("Page Up");
@ -101,10 +101,10 @@ const wxString WXKeyToString(int keycode)
case WXK_NUMPAD_SPACE: return _("NP Space");
case WXK_NUMPAD_TAB: return _("NP Tab");
case WXK_NUMPAD_ENTER: return _("NP Enter");
case WXK_NUMPAD_F1: return wxT("NP F1");
case WXK_NUMPAD_F2: return wxT("NP F2");
case WXK_NUMPAD_F3: return wxT("NP F3");
case WXK_NUMPAD_F4: return wxT("NP F4");
case WXK_NUMPAD_F1: return "NP F1";
case WXK_NUMPAD_F2: return "NP F2";
case WXK_NUMPAD_F3: return "NP F3";
case WXK_NUMPAD_F4: return "NP F4";
case WXK_NUMPAD_HOME: return _("NP Home");
case WXK_NUMPAD_LEFT: return _("NP Left");
case WXK_NUMPAD_UP: return _("NP Up");
@ -133,7 +133,7 @@ const wxString WXKeyToString(int keycode)
return wxString((wxChar)keycode, 1);
}
return wxT("");
return "";
}
const wxString WXKeymodToString(int modifier)
@ -142,18 +142,18 @@ const wxString WXKeymodToString(int modifier)
if (modifier & wxMOD_META)
#ifdef __APPLE__
mods += wxT("Cmd+");
mods += "Cmd+";
#elif defined _WIN32
mods += wxT("Win+");
mods += "Win+";
#else
mods += wxT("Meta+");
mods += "Meta+";
#endif
if (modifier & wxMOD_CONTROL)
mods += wxT("Ctrl+");
mods += "Ctrl+";
if (modifier & wxMOD_ALT)
mods += wxT("Alt+");
mods += "Alt+";
if (modifier & wxMOD_SHIFT)
mods += wxT("Shift+");
mods += "Shift+";
return mods;
}